配合方惠圣修改代码

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 @Service
 public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDept> implements ISysDeptService {
 
-    private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);//还原代码
+    private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);
 
     @Autowired
     private SysDeptMapper deptMapper;
@@ -63,13 +63,24 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptMapper.selectDeptList(dept);
     }
 
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
     @Override
     public List<SysDept> deptList(SysDept dept) {
         dept.setTenantId(SecurityUtils.getTenantId());
         return deptMapper.deptList(dept);
     }
 
-
+    /**
+     * 构建前端所需要树结构
+     *
+     * @param depts 部门列表
+     * @return 树结构列表
+     */
     @Override
     public List<TreeNode> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {
         List<Long> userIds = new ArrayList<>();
@@ -85,6 +96,12 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptTrees.stream().map(TreeNode::new).collect(Collectors.toList());
     }
 
+    /**
+     * 填充用户信息到部门树
+     *
+     * @param depts  部门列表
+     * @param users  用户列表
+     */
     private void fillUsersToDepts(List<SysDept> depts, List<SysUser> users) {
         for (SysDept dept : depts) {
             if (dept.getChildren() == null || dept.getChildren().isEmpty()) {
@@ -99,12 +116,24 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         }
     }
 
+    /**
+     * 根据部门ID查询信息
+     *
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
     private List<SysUser> filterUsersByDept(List<SysUser> users, Long deptId) {
         return users.stream()
                 .filter(user -> user.getDeptId().equals(deptId))
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
     private List<SysDept> buildDeptTree2(List<SysDept> depts) {
         List<SysDept> returnList = new ArrayList<SysDept>();
         List<Long> tempList = new ArrayList<Long>();
@@ -124,6 +153,13 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return returnList;
     }
 
+    /**
+     * @description: 递归列表
+     * @author: fu
+     * @date: 2024/8/8 16:00
+     * @param: [list, t]
+     * @return: void
+     **/
     private void recursionFn2(List<SysDept> list, SysDept t) {
         List<SysDept> childList = getChildList(list, t);
         t.setChildren(childList);
@@ -173,30 +209,6 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-/*    @Override
-    public List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {
-        List<SysDept> deptTrees = buildDeptTree(depts);
-        List<TreeSelect> treeSelectList = new ArrayList<>();
-        for (SysDept dept : deptTrees) {
-            TreeSelect treeSelect = new TreeSelect();
-            treeSelect.setId(dept.getDeptId());
-            treeSelect.setLabel(dept.getDeptName());
-            List<TreeSelect> children = new ArrayList<>();
-            for (SysUser user : users) {
-                if (user.getDeptId().equals(dept.getDeptId())) {
-                    TreeSelect child = new TreeSelect();
-                    child.setId(user.getUserId());
-                    child.setLabel(user.getNickName());
-                    children.add(child);
-                }
-            }
-            treeSelect.setChildren(children);
-            treeSelectList.add(treeSelect);
-        }
-        return treeSelectList;
-    }*/
-
-
     /**
      * 根据角色ID查询部门树信息
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/TreeNode.java

@@ -30,20 +30,10 @@ public class TreeNode implements Serializable {
      */
     private String label;
 
-//    /**
-//     * 用户头像
-//     */
-//    private String avatar;
-//
-//    /**
-//     * 用户职位
-//     */
-//    private String post;
-
     /**
      * 子节点
      */
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    //@JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children;
 
     public TreeNode() {
@@ -55,14 +45,6 @@ public class TreeNode implements Serializable {
         this.children = children;
     }
 
-//    public TreeNode(SysUser user) {
-//        this.id = user.getUserId();
-//        this.label = user.getNickName();
-//        this.avatar = user.getAvatar();
-//        this.post = user.getPost();
-//        this.children = new ArrayList<>();
-//    }
-
     public TreeNode(SysDept dept) {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/UserTreeNode.java

@@ -1,10 +1,10 @@
 package com.usky.system.service.vo;
-import com.usky.system.domain.SysDeptVO;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.usky.system.domain.SysUser;
 import lombok.Data;
 
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.List;
 
 /**
  * @description：TODO
@@ -12,7 +12,21 @@ import java.util.Date;
  * @create： 2024-08-01 11:40
  */
 @Data
-public class UserTreeNode extends TreeNode {
+public class UserTreeNode extends TreeNode{
+
+    /**
+     * 节点ID
+     */
+    private Long id;
+
+    /**
+     * 节点名称
+     */
+    private String label;
+
+     /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeNode> children;
 
     /** 用户ID */
     private Long userId;
@@ -44,9 +58,9 @@ public class UserTreeNode extends TreeNode {
     /** 岗位 */
     private String post;
 
-
     public UserTreeNode(SysUser user) {
-        super(user.getUserId(), user.getNickName(), new ArrayList<>());
+        this.id = user.getUserId();
+        this.label = user.getNickName();
         this.userId = user.getUserId();
         this.deptId = user.getDeptId();
         this.userName = user.getUserName();
@@ -57,6 +71,7 @@ public class UserTreeNode extends TreeNode {
         this.avatar = user.getAvatar();
         this.address = user.getAddress();
         this.post = user.getPost();
+        this.children = new ArrayList<>();
     }
 }