From 60028814fcd6318aa32f08d617750526d9fda012 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Fri, 21 Nov 2025 11:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E7=8A=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/web/DepartmentController.java    | 2 +-
 .../basic/info/command/query/DepartmentQueryExe.java       | 7 ++++---
 .../zcloud/basic/info/service/DepartmentServiceImpl.java   | 2 +-
 .../java/com/zcloud/basic/info/api/DepartmentServiceI.java | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java
index 91ceff6..2ae0f5b 100644
--- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java
+++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java
@@ -92,7 +92,7 @@ public class DepartmentController {
     }
     @ApiOperation("所有企业下部门树状所有数据")
     @PostMapping("/listAllTree")
-    public MultiResponse<List<DepartmentTreeInfoCO>> listAllTree() {
+    public MultiResponse<DepartmentTreeInfoCO> listAllTree() {
         return MultiResponse.of(departmentService.listAllTree());
     }
 
diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
index a5007e3..d911e3e 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
@@ -144,7 +144,7 @@ public class DepartmentQueryExe {
         return departmentCoConvertor.converDOsToCOs(list);
     }
 
-    public Collection<List<DepartmentTreeInfoCO>> listAllTree() {
+    public List<DepartmentTreeInfoCO> listAllTree() {
 
         List<DepartmentDO> pageResponse = departmentRepository.listAllTree();
         if (CollUtil.isEmpty(pageResponse)) {
@@ -160,16 +160,17 @@ public class DepartmentQueryExe {
         //GBS部门根节点父部门是tenantId
         //按照企业分组
         List<List<DepartmentTreeInfoCO>> result1= new ArrayList<>();
+        List<DepartmentTreeInfoCO> result2= new ArrayList<>();
         Map<Long, List<DepartmentTreeInfoCO>> corpMap = examCenterCOS.stream().collect(Collectors.groupingBy(DepartmentTreeInfoCO::getCorpinfoId));
         corpMap.forEach((corpId, list) -> {
             List<DepartmentTreeInfoCO> departmentTreeInfoCOS = Tools.buildEntityTree(list, "id", "parentId", "childrenList", 0L);
             if(CollUtil.isNotEmpty(departmentTreeInfoCOS)){
-                result1.add(departmentTreeInfoCOS);
+                result2.addAll(departmentTreeInfoCOS);
             }
         });
 
 
-        return result1;
+        return result2;
     }
 }
 
diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java
index 8b8b391..b27c5ff 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java
@@ -83,7 +83,7 @@ public class DepartmentServiceImpl implements DepartmentServiceI {
     }
 
     @Override
-    public Collection<List<DepartmentTreeInfoCO>> listAllTree() {
+    public List<DepartmentTreeInfoCO> listAllTree() {
         return departmentQueryExe.listAllTree();
     }
 }
diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java
index 0d4b701..c49c5ba 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java
@@ -36,6 +36,6 @@ public interface DepartmentServiceI {
 
     List<DepartmentCO> getDeptList();
 
-    Collection<List<DepartmentTreeInfoCO>> listAllTree();
+    List<DepartmentTreeInfoCO> listAllTree();
 }