代码优化

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptDetailVo.java

@@ -47,6 +47,7 @@ public class SysDeptDetailVo implements Serializable {
     /**
      * 负责人
      */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "leader")
     private String leaderName;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptIndexVo.java

@@ -46,12 +46,14 @@ public class SysDeptIndexVo implements Serializable {
     /**
      * 负责人
      */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "leader")
     private String leaderName;
 
     /**
-     * 负责人
+     * 分管领导
      */
-    @Translation(type = TransConstant.OSS_ID_TO_URL)
-    private Long avatar;
+    private Long mainLeader;
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "mainLeader")
+    private String mainLeaderName;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java

@@ -6,6 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.system.domain.SysDept;
 
 import java.io.Serial;
@@ -72,6 +74,7 @@ public class SysDeptVo implements Serializable {
      * 负责人
      */
     @ExcelProperty(value = "负责人")
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "leader")
     private String leaderName;
 
     /**
@@ -107,6 +110,7 @@ public class SysDeptVo implements Serializable {
      * 分管领导
      */
     private Long mainLeader;
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "mainLeader")
     private String mainLeaderName;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -345,21 +345,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Override
     public List<SysDeptIndexVo> indexDeptList() {
         List<SysDept> deptList = baseMapper.selectList(SysDept::getStatus, UserConstants.DEPT_NORMAL);
-        //查询用户信息
-        List<Long> userIds = StreamUtils.toList(deptList, SysDept::getLeader);
-        userIds = CollectionUtils.isEmpty(userIds) ? List.of(-1L) : userIds;
-        List<SysUser> userList = userMapper.selectList(SysUser::getUserId, userIds);
-        List<SysDeptIndexVo> indexList = BeanUtil.copyToList(deptList, SysDeptIndexVo.class);
-        indexList.forEach(sdi -> {
-            userList.stream()
-                .filter(user -> Objects.equals(user.getUserId(), sdi.getLeader()))
-                .findFirst()
-                .ifPresent(u -> {
-                    sdi.setLeaderName(u.getNickName());
-                    sdi.setAvatar(u.getAvatar());
-                });
-        });
-        return indexList;
+        return BeanUtil.copyToList(deptList, SysDeptIndexVo.class);
     }
 
     @Override