diff --git a/backend/src/main/java/com/designhub/service/UserService.java b/backend/src/main/java/com/designhub/service/UserService.java index f843b5c..e9abee9 100644 --- a/backend/src/main/java/com/designhub/service/UserService.java +++ b/backend/src/main/java/com/designhub/service/UserService.java @@ -942,10 +942,11 @@ public class UserService { .roles(roleCodes) .status(user.getStatus()) .isDepartmentLeader(isDepartmentLeader) + .isAdmin(user.getIsAdmin()) .build(); - log.info("getUserInfoByToken - 返回VO: id={}, deptId={}, deptName={}, roleIds={}, roles={}, isDepartmentLeader={}", - userInfoVO.getId(), userInfoVO.getDeptId(), userInfoVO.getDeptName(), userInfoVO.getRoleIds(), roleCodes, isDepartmentLeader); + log.info("getUserInfoByToken - 返回VO: id={}, deptId={}, deptName={}, roleIds={}, roles={}, isDepartmentLeader={}, isAdmin={}", + userInfoVO.getId(), userInfoVO.getDeptId(), userInfoVO.getDeptName(), userInfoVO.getRoleIds(), roleCodes, isDepartmentLeader, user.getIsAdmin()); return userInfoVO; } diff --git a/backend/src/main/java/com/designhub/vo/UserInfoVO.java b/backend/src/main/java/com/designhub/vo/UserInfoVO.java index 1b5efff..a92b949 100644 --- a/backend/src/main/java/com/designhub/vo/UserInfoVO.java +++ b/backend/src/main/java/com/designhub/vo/UserInfoVO.java @@ -80,5 +80,10 @@ public class UserInfoVO { * 是否为部门负责人:0-否 1-是 */ private Integer isDepartmentLeader; + + /** + * 是否为管理员:0-否 1-是 + */ + private Integer isAdmin; } diff --git a/frontend/src/views/Analytics.vue b/frontend/src/views/Analytics.vue index 69fd29d..7f7c77a 100644 --- a/frontend/src/views/Analytics.vue +++ b/frontend/src/views/Analytics.vue @@ -211,7 +211,7 @@