diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java index 144b55a6..1af216d5 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java @@ -79,15 +79,6 @@ public class DeptController { return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); } - @GetMapping(value = {"/list-simple", "/simple-dept-list"}) - @Operation(summary = "获取部门精简信息列表(不包含当前用户归属部门的上级部门)", description = "只包含被开启的部门,主要用于前端的下拉选项") - @DeptVisitIgnore - public CommonResult> getNoParentSimpleDeptList() { - List list = deptService.getNoParentDeptList( - new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); - return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); - } - @GetMapping("/get") @Operation(summary = "获得部门信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java index 285063f7..a0b765e5 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java @@ -59,7 +59,6 @@ public interface DeptService { * @return 部门列表 */ List getDeptList(DeptListReqVO reqVO); - List getNoParentDeptList(DeptListReqVO reqVO); /** * 获得指定编号的部门 Map diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index cc63ff95..89d1f64e 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -19,11 +19,9 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import java.util.*; -import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; -import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; /** @@ -171,28 +169,6 @@ public class DeptServiceImpl implements DeptService { return list; } - @Override - public List getNoParentDeptList(DeptListReqVO reqVO){ - List list = deptMapper.selectList(reqVO); - // 循环过滤掉当前用户归属部门的所有上级部门 - Long loginUserDeptId = getLoginUserDeptId(); - Set parentIds = new HashSet<>(); - Map deptMap = list.stream().collect(Collectors.toMap(DeptDO::getId, d -> d)); - Long currentId = loginUserDeptId; - while (currentId != null && !DeptDO.PARENT_ID_ROOT.equals(currentId)) { - DeptDO dept = deptMap.get(currentId); - if (dept == null) break; - Long parentId = dept.getParentId(); - if (parentId == null || DeptDO.PARENT_ID_ROOT.equals(parentId)) break; - parentIds.add(parentId); - currentId = parentId; - } - // 过滤掉所有上级部门 - return list.stream() - .filter(dept -> !parentIds.contains(dept.getId())) - .collect(Collectors.toList()); - } - @Override public List getChildDeptList(Collection ids) { List children = new LinkedList<>();