From a61187d67401e08640be0ee5dc1f0a3e182fe303 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 26 Jan 2026 09:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=8D=A2=E6=88=90=E5=A4=9A=E4=B8=AA=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DepartmentMapper.xml          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
index 30f8765b..46138c14 100644
--- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
@@ -5,7 +5,11 @@
 <mapper namespace="com.zcloud.basic.info.persistence.mapper.DepartmentMapper">
 
      <select id="listAllTree" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
-         select * from department where delete_enum = 'FALSE' order by dep_order, create_time desc
+         select d.*
+         from department d
+                  left join corp_info c on d.corpinfo_id = c.id
+         where d.delete_enum = 'FALSE'
+         order by c.corp_order, c.create_time desc, d.dep_order, d.create_time desc
     </select>
     <select id="selectDeptPage" resultType="com.zcloud.basic.info.persistence.dataobject.DepartmentDO">
         SELECT *