部门列表

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

@@ -123,7 +123,7 @@ public class DeptController {
     @GetMapping("/list-dept-user")
     @Operation(summary = "获取部门和人员列表")
     @PreAuthorize("@ss.hasPermission('system:dept:user')")
-    public CommonResult<List<DeptDO>> getDeptUserList() {
+    public CommonResult<List<DeptSimpleRespVO>> getDeptUserList() {
         // 获得部门列表，只要开启状态的
         DeptListReqVO deptListReqVO = new DeptListReqVO();
         deptListReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
@@ -141,20 +141,9 @@ public class DeptController {
                 simpleDeptList.add(deptSimpleRespVO);
             }
         });
-
-        List<AdminUserDO> adminUserDOList = new ArrayList<>();
-
         //将list转为树状
-        List<DeptDO> list = deptService.buildTree(deptDOList,0);
+//        List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
-        //为部门list添加下级用户
+        return success(simpleDeptList);
-        List<DeptDO> list1 = deptService.setBuildTree(list);
-//        for (DeptDO deptDO : list){
-//            if (deptDO.getChildren() == null){
-//                List<AdminUserDO> adminUserDOList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId()));
-//                deptDO.setChildren(adminUserDOList);
-//            }
-//        }
-        return success(list1);
     }
 
 }

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

@@ -71,8 +71,8 @@ public class DeptDO extends TenantBaseDO {
      */
     private Long enterpriseId;
 
-    @TableField(exist = false)
+//    @TableField(exist = false)
-    private List children;
+//    private List children;
 
 
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.yunxi.scm.framework.common.util.collection.CollectionUtils;
 import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO;
 import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
+import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
 import com.yunxi.scm.module.system.controller.admin.user.vo.user.UserPageItemRespVO;
 import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO;
@@ -106,10 +107,5 @@ public interface DeptService {
      * 组装为树形结构
      *
      */
-    List<DeptDO> buildTree(List<DeptDO> deptDOList, long pid);
+//    List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid);
-    /**
-     * 为部门树形结构添加用户
-     *
-     */
-    List<DeptDO> setBuildTree(List<DeptDO> deptDOList);
 }

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

@@ -6,6 +6,7 @@ import com.yunxi.scm.framework.common.enums.CommonStatusEnum;
 import com.yunxi.scm.framework.datapermission.core.annotation.DataPermission;
 import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO;
 import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptListReqVO;
+import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import com.yunxi.scm.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO;
 import com.yunxi.scm.module.system.convert.dept.DeptConvert;
 import com.yunxi.scm.module.system.dal.dataobject.dept.DeptDO;
@@ -40,8 +41,6 @@ public class DeptServiceImpl implements DeptService {
 
     @Resource
     private DeptMapper deptMapper;
-    @Resource
-    private AdminUserService userService;
 
     @Override
     @CacheEvict(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST,
@@ -206,30 +205,17 @@ public class DeptServiceImpl implements DeptService {
         });
     }
 
-    @Override
+//    @Override
-    public List<DeptDO> buildTree(List<DeptDO> deptDOList, long pid) {
+//    public List<DeptSimpleRespVO> buildTree(List<DeptSimpleRespVO> deptDOList, long pid) {
-        List<DeptDO> treeList = new ArrayList<>();
+//        List<DeptSimpleRespVO> treeList = new ArrayList<>();
-        for (DeptDO 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;
-    }
+//    }
 
-    @Override
-    public List<DeptDO> setBuildTree(List<DeptDO> deptDOList) {
-        List<DeptDO> tree = new ArrayList<>();
-        for (DeptDO deptDO : deptDOList) {
-            if (deptDO.getChildren() != null && deptDO.getChildren().size()>0) {
-                setBuildTree(deptDO.getChildren());
-            }else{
-                List<AdminUserDO> adminUserDOList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId()));
-                deptDO.setChildren(adminUserDOList);
-            }
-        }
-        return tree;
-    }
 
 }