部门列表

yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java

@@ -129,8 +129,7 @@ public class DeptController {
         deptListReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
         List<DeptDO> deptDOList = deptService.getDeptList(deptListReqVO);
         //将Dept转化为简单的Dept
-        List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>();
+        List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>(DeptConvert.INSTANCE.convertList02(deptDOList));
-        simpleDeptList.addAll(DeptConvert.INSTANCE.convertList02(deptDOList));
         deptDOList.forEach(deptDO -> {
             List<AdminUserDO> adminUserList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId()));
             for (AdminUserDO adminUserDO : adminUserList){
@@ -142,8 +141,8 @@ public class DeptController {
             }
         });
         //将list转为树状
-//        List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
+        List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
-        return success(simpleDeptList);
+        return success(list);
     }
 
 }

yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java

@@ -24,5 +24,7 @@ public class DeptSimpleRespVO {
     @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long parentId;
 
+    @Schema(description = "子集" )
+    private List<DeptSimpleRespVO> children;
 
 }

yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.yunxi.scm.framework.common.enums.CommonStatusEnum;
 import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO;
 import com.yunxi.scm.module.system.controller.admin.auth.vo.AuthPermissionInfoRespVO;
+import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import com.yunxi.scm.module.system.dal.dataobject.user.AdminUserDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -71,8 +72,8 @@ public class DeptDO extends TenantBaseDO {
      */
     private Long enterpriseId;
 
-//    @TableField(exist = false)
+    @TableField(exist = false)
-//    private List children;
+    private List<DeptSimpleRespVO> children;
 
 
 }

yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java

@@ -107,5 +107,5 @@ public interface DeptService {
      * 组装为树形结构
      *
      */
-//    List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid);
+    List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid);
 }

yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java

@@ -205,17 +205,17 @@ public class DeptServiceImpl implements DeptService {
         });
     }
 
-//    @Override
+    @Override
-//    public List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid) {
+    public List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid) {
-//        List<DeptSimpleRespVO> treeList = new ArrayList<>();
+        List<DeptSimpleRespVO> treeList = new ArrayList<>();
-//        for (DeptSimpleRespVO dept : deptDOList) {
+        for (DeptSimpleRespVO dept : deptDOList) {
-//            if (dept.getParentId() == pid) {
+            if (dept.getParentId() == pid) {
-//                dept.setChildren(buildTree(deptDOList, dept.getId()));
+                dept.setChildren(buildTree(deptDOList, dept.getId()));
-//                treeList.add(dept);
+                treeList.add(dept);
-//            }
+            }
-//        }
+        }
-//        return treeList;
+        return treeList;
-//    }
+    }
 
 
 }