From 3161ebfd591e39d3de320755ed4658cad7e8e6ba Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 4 Jan 2026 10:03:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0isAdmin=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=B0UserInfoVO=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=8A=A2=E5=8D=95=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/designhub/service/UserService.java | 5 +- .../java/com/designhub/vo/UserInfoVO.java | 5 + frontend/src/views/Analytics.vue | 99 +++++++++++++++++-- frontend/src/views/TaskHall.vue | 5 + 4 files changed, 104 insertions(+), 10 deletions(-) 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 @@