From 6dac4973910b332f1614bd66a9fd3c03ba39a3dd Mon Sep 17 00:00:00 2001 From: "ray.ma" Date: Thu, 24 Apr 2025 15:48:51 +0800 Subject: [PATCH] modify userInfo --- src/main/java/com/wj/manager/dto/AccountInfoDTO.java | 5 +++++ src/main/java/com/wj/manager/enums/RoleTypeEnum.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wj/manager/dto/AccountInfoDTO.java b/src/main/java/com/wj/manager/dto/AccountInfoDTO.java index 18f528b..586058f 100644 --- a/src/main/java/com/wj/manager/dto/AccountInfoDTO.java +++ b/src/main/java/com/wj/manager/dto/AccountInfoDTO.java @@ -2,8 +2,11 @@ package com.wj.manager.dto; import com.wj.manager.entity.AccountEntity; import com.wj.manager.enums.CollegeTypeEnum; +import com.wj.manager.enums.RoleTypeEnum; import lombok.Data; +import java.util.List; + @Data public class AccountInfoDTO { private Long userId; @@ -14,6 +17,7 @@ public class AccountInfoDTO { private String birthday; private String phone; private String college; + private List roles; public AccountInfoDTO(AccountEntity entity) { this.userId = entity.getId(); @@ -24,5 +28,6 @@ public class AccountInfoDTO { this.birthday = entity.getBirthday(); this.phone = entity.getPhone(); this.college = CollegeTypeEnum.getNameByType(entity.getCollege()); + this.roles = List.of(RoleTypeEnum.getByCode(entity.getRole()).getMessage()); } } diff --git a/src/main/java/com/wj/manager/enums/RoleTypeEnum.java b/src/main/java/com/wj/manager/enums/RoleTypeEnum.java index 6e897d9..dd457e6 100644 --- a/src/main/java/com/wj/manager/enums/RoleTypeEnum.java +++ b/src/main/java/com/wj/manager/enums/RoleTypeEnum.java @@ -7,9 +7,9 @@ import lombok.Getter; @AllArgsConstructor public enum RoleTypeEnum { UNKNOWN(0, "未知"), - ADMIN(1, "管理员"), - TEACHER(2, "教师"), - STUDENT(3, "学生"), + ADMIN(1, "admin"), + TEACHER(2, "teacher"), + STUDENT(3, "student"), ; private final Integer code; private final String message;