Browse Source

用户缓存信息增加部门ID

chenjun 1 year ago
parent
commit
01c926ca1f

+ 3 - 1
client/src/store/modules/user.ts

@@ -11,6 +11,7 @@ interface UserVO {
   avatar: string
   nickname: string
   deptName: string
+  deptId: string
 }
 interface UserInfoVO {
   permissions: string[]
@@ -28,7 +29,8 @@ export const useUserStore = defineStore('admin-user', {
       id: 0,
       avatar: '',
       nickname: '',
-      deptName: ''
+      deptName: '',
+      deptId: ''
     }
   }),
   getters: {

+ 4 - 1
zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/controller/admin/auth/AuthController.java

@@ -7,6 +7,7 @@ import com.zjugis.framework.operatelog.core.annotations.OperateLog;
 import com.zjugis.framework.security.config.SecurityProperties;
 import com.zjugis.module.system.controller.admin.auth.vo.*;
 import com.zjugis.module.system.convert.auth.AuthConvert;
+import com.zjugis.module.system.dal.dataobject.dept.DeptDO;
 import com.zjugis.module.system.dal.dataobject.permission.MenuDO;
 import com.zjugis.module.system.dal.dataobject.permission.RoleDO;
 import com.zjugis.module.system.dal.dataobject.user.AdminUserDO;
@@ -113,7 +114,9 @@ public class AuthController {
 
         // 2. 拼接结果返回
         AuthPermissionInfoRespVO authPermissionInfoRespVO = AuthConvert.INSTANCE.convert(user, roles, menuList);
-        authPermissionInfoRespVO.getUser().setDeptName(deptService.getDept(user.getDeptId()).getName());
+        DeptDO dept = deptService.getDept(user.getDeptId());
+        authPermissionInfoRespVO.getUser().setDeptId(dept.getId());
+        authPermissionInfoRespVO.getUser().setDeptName(dept.getName());
         return success(authPermissionInfoRespVO);
     }
 

+ 3 - 0
zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java

@@ -44,6 +44,9 @@ public class AuthPermissionInfoRespVO {
         @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.jpg")
         private String avatar;
 
+        @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
+        private String deptId;
+
         @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "自然资源产品部")
         private String deptName;