From 688a49f51fc1097e7e96de89f85b7b9fa2a0d395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=9A=E6=96=87?=
 <chenbowen1@cn.wilmar-intl.com>
Date: Mon, 23 Jun 2025 16:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=94=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/dept/DeptController.java |  9 -------
 .../system/service/dept/DeptService.java      |  1 -
 .../system/service/dept/DeptServiceImpl.java  | 24 -------------------
 3 files changed, 34 deletions(-)

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<List<DeptSimpleRespVO>> getNoParentSimpleDeptList() {
-        List<DeptDO> 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<DeptDO> getDeptList(DeptListReqVO reqVO);
-    List<DeptDO> 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<DeptDO> getNoParentDeptList(DeptListReqVO reqVO){
-        List<DeptDO> list = deptMapper.selectList(reqVO);
-        // 循环过滤掉当前用户归属部门的所有上级部门
-        Long loginUserDeptId = getLoginUserDeptId();
-        Set<Long> parentIds = new HashSet<>();
-        Map<Long, DeptDO> 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<DeptDO> getChildDeptList(Collection<Long> ids) {
         List<DeptDO> children = new LinkedList<>();