10.17，部门信息

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -97,38 +97,44 @@ public class DeptController {
     @GetMapping("/GetUserDept")
     @Operation(summary = "获得登录人员工作间信息")
     public CommonResult<DeptRespVO> getUserDept() {
+        // 获取部门信息
         DeptDO dept = deptService.getUserDept();
-        //新加的负责人用户信息
-        if (dept != null) {
-            AdminUserDO user = adminUserService.getUser(dept.getLeaderUserId());
-            dept.setUser(user);
-            DeptRespVO newDept = BeanUtils.toBean(dept, DeptRespVO.class);
-
-            List<AdminUserDO> allUser = adminUserService.getDeptUser();//获取所有用户
-
-            List<AdminUserDO> student = new ArrayList<>();
-            List<AdminUserDO> supervisor = new ArrayList<>();
-            List<String> userAchievements = new ArrayList<>();
-            for (AdminUserDO ad : allUser) {
-                if (ad.getUserType().equals("1") || ad.getUserType().equals("2")) {
-                    student.add(ad);
-                } else if (ad.getUserType().equals("3")) {
-                    supervisor.add(ad);
-                }
-                // 获取用户成就并添加到列表中
-                var userAchievement = userAchievementService.getUserAchievementbyUserId(Math.toIntExact(ad.getId()));
-                if (userAchievement != null) {
-                    userAchievements.add(userAchievement.getDetail());
-                }
-            }
-            newDept.setSupervisorNum(String.valueOf(supervisor.size()));
-            newDept.setStudentNum(String.valueOf(student.size()));
-            newDept.setUserAchievements(userAchievements);
-            System.out.println(newDept);
-            return success(newDept);
-        } else {
+        if (dept == null) {
             return null;
         }
+
+        // 获取负责人用户信息
+        Long leaderUserId = dept.getLeaderUserId();
+        AdminUserDO user = (leaderUserId != null) ? adminUserService.getUser(leaderUserId) : null;
+        dept.setUser(user);
+
+        DeptRespVO newDept = BeanUtils.toBean(dept, DeptRespVO.class);
+
+        // 获取所有用户
+        List<AdminUserDO> allUser = adminUserService.getDeptUser();
+        List<AdminUserDO> student = new ArrayList<>();
+        List<AdminUserDO> supervisor = new ArrayList<>();
+        List<String> userAchievements = new ArrayList<>();
+
+        for (AdminUserDO ad : allUser) {
+            if (ad.getUserType().equals("1") || ad.getUserType().equals("2")) {
+                student.add(ad);
+            } else if (ad.getUserType().equals("3")) {
+                supervisor.add(ad);
+            }
+
+            var userAchievement = userAchievementService.getUserAchievementbyUserId(Math.toIntExact(ad.getId()));
+            if (userAchievement != null) {
+                userAchievements.add(userAchievement.getDetail());
+            }
+        }
+
+        newDept.setSupervisorNum(String.valueOf(supervisor.size()));
+        newDept.setStudentNum(String.valueOf(student.size()));
+        newDept.setUserAchievements(userAchievements);
+
+        System.out.println(newDept);
+        return success(newDept);
     }
 
 }