From 0350cdae6b3d38f6b98ee4b2e9663ff1e84fc568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Tue, 10 Oct 2023 17:41:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/dept/DeptController.java | 17 ++------- .../system/dal/dataobject/dept/DeptDO.java | 4 +- .../system/service/dept/DeptService.java | 8 +--- .../system/service/dept/DeptServiceImpl.java | 38 ++++++------------- 4 files changed, 19 insertions(+), 48 deletions(-) diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java index ebda8e1..f4c7c95 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/dept/DeptController.java +++ b/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> getDeptUserList() { + public CommonResult> getDeptUserList() { // 获得部门列表，只要开启状态的 DeptListReqVO deptListReqVO = new DeptListReqVO(); deptListReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); @@ -141,20 +141,9 @@ public class DeptController { simpleDeptList.add(deptSimpleRespVO); } }); - - List adminUserDOList = new ArrayList<>(); - //将list转为树状 - List list = deptService.buildTree(deptDOList,0); - //为部门list添加下级用户 - List list1 = deptService.setBuildTree(list); -// for (DeptDO deptDO : list){ -// if (deptDO.getChildren() == null){ -// List adminUserDOList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId())); -// deptDO.setChildren(adminUserDOList); -// } -// } - return success(list1); +// List list = deptService.buildTree(simpleDeptList,0); + return success(simpleDeptList); } } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java index da1262d..624bf80 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/dept/DeptDO.java +++ b/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) - private List children; +// @TableField(exist = false) +// private List children; } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java index 0e86e03..17dc428 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptService.java +++ b/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 buildTree(List deptDOList, long pid); - /** - * 为部门树形结构添加用户 - * - */ - List setBuildTree(List deptDOList); +// List buildTree(List deptDOList, long pid); } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java index 06e3c17..8afe295 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/service/dept/DeptServiceImpl.java +++ b/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 - public List buildTree(List deptDOList, long pid) { - List treeList = new ArrayList<>(); - for (DeptDO dept : deptDOList) { - if (dept.getParentId() == pid) { - dept.setChildren(buildTree(deptDOList, dept.getId())); - treeList.add(dept); - } - } - return treeList; - } +// @Override +// public List buildTree(List deptDOList, long pid) { +// List treeList = new ArrayList<>(); +// for (DeptSimpleRespVO dept : deptDOList) { +// if (dept.getParentId() == pid) { +// dept.setChildren(buildTree(deptDOList, dept.getId())); +// treeList.add(dept); +// } +// } +// return treeList; +// } - @Override - public List setBuildTree(List deptDOList) { - List tree = new ArrayList<>(); - for (DeptDO deptDO : deptDOList) { - if (deptDO.getChildren() != null && deptDO.getChildren().size()>0) { - setBuildTree(deptDO.getChildren()); - }else{ - List adminUserDOList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId())); - deptDO.setChildren(adminUserDOList); - } - } - return tree; - } }