From 9298d54baf92de3b92ddd592913fd8dc6d4f9f80 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Thu, 15 Jan 2026 15:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8=E6=A0=91?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/info/command/query/DepartmentQueryExe.java      | 8 ++++----
 .../src/main/resources/mapper/DepartmentMapper.xml        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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 f7364fc9..9df05228 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
@@ -177,13 +177,13 @@ public class DepartmentQueryExe {
         //按照企业分组
         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);
+//        Map<Long, List<DepartmentTreeInfoCO>> corpMap = examCenterCOS.stream().collect(Collectors.groupingBy(DepartmentTreeInfoCO::getCorpinfoId));
+//        corpMap.forEach((corpId, list) -> {
+            List<DepartmentTreeInfoCO> departmentTreeInfoCOS = Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList", 0L);
             if(CollUtil.isNotEmpty(departmentTreeInfoCOS)){
                 result2.addAll(departmentTreeInfoCOS);
             }
-        });
+//        });
         return result2;
     }
 
diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
index 3fb3e5fb..30f8765b 100644
--- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
@@ -24,7 +24,7 @@
                 #{item}
             </foreach>
         </if>
-        order by d.dep_order, d.create_time desc
+        order by c.corp_order, c.create_time desc,d.dep_order, d.create_time desc
     </select>
 </mapper>