添加部门信息

client/src/config/axios/index.ts

@@ -14,7 +14,6 @@ const request = (option: any) => {
     ...config,
     responseType: responseType,
     headers: {
-      tag: 'dev',
       'Content-Type': headersType || default_headers
     }
   })

client/src/store/modules/user.ts

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

client/src/views/OaSystem/oaLayout/menus.vue

@@ -9,7 +9,7 @@
       </div>
       <div class="userInfo">
         <h4>{{ userName }}</h4>
-        <p>部门信息</p>
+        <p>{{ deptName }}</p>
       </div>
     </div>
     <div class="menus-btns">
@@ -62,6 +62,8 @@ const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
 const userName = user.user.nickname ? user.user.nickname : 'Admin'
 
+const deptName = user.user.deptName ? user.user.deptName : '部门信息'
+
 const mouseenterIndex = ref(-1)
 const loginOut = () => {
   ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {

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

@@ -12,6 +12,7 @@ import com.zjugis.module.system.dal.dataobject.permission.RoleDO;
 import com.zjugis.module.system.dal.dataobject.user.AdminUserDO;
 import com.zjugis.module.system.enums.logger.LoginLogTypeEnum;
 import com.zjugis.module.system.service.auth.AdminAuthService;
+import com.zjugis.module.system.service.dept.DeptService;
 import com.zjugis.module.system.service.permission.MenuService;
 import com.zjugis.module.system.service.permission.PermissionService;
 import com.zjugis.module.system.service.permission.RoleService;
@@ -53,6 +54,8 @@ public class AuthController {
     @Resource
     private MenuService menuService;
     @Resource
+    private DeptService deptService;
+    @Resource
     private PermissionService permissionService;
     @Resource
     private SocialUserService socialUserService;
@@ -109,7 +112,9 @@ public class AuthController {
         menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
 
         // 2. 拼接结果返回
-        return success(AuthConvert.INSTANCE.convert(user, roles, menuList));
+        AuthPermissionInfoRespVO authPermissionInfoRespVO = AuthConvert.INSTANCE.convert(user, roles, menuList);
+        authPermissionInfoRespVO.getUser().setDeptName(deptService.getDept(user.getDeptId()).getName());
+        return success(authPermissionInfoRespVO);
     }
 
     // ========== 短信登录相关 ==========

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 deptName;
+
     }
 
     @Schema(description = "管理后台 - 登录用户的菜单信息 Response VO")

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/framework/datapermission/config/DataPermissionConfiguration.java

@@ -18,8 +18,6 @@ public class DataPermissionConfiguration {
     public DeptDataPermissionRuleCustomizer sysDeptDataPermissionRuleCustomizer() {
         return rule -> {
             // dept
-            rule.addDeptColumn(AdminUserDO.class);
-            rule.addDeptColumn(DeptDO.class, "id");
             // user
         };
     }