From 56b2d17949ae2eb233775838e77213a8decdd788 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Wed, 26 Nov 2025 14:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/impl/DepartmentRepositoryImpl.java           | 6 +++---
 .../src/main/resources/mapper/DepartmentMapper.xml          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
index cf4a516..1c71111 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java
@@ -54,7 +54,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
     public List<DepartmentDO> listTree(Map<String, Object> parmas) {
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
-        queryWrapper.orderByDesc("dep_order");
+        queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
         List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
         if (CollUtil.isEmpty(departmentDOList)) {
             return Collections.emptyList();
@@ -67,7 +67,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
         IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
         List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
         return departmentDOList;
     }
@@ -77,7 +77,7 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
         IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
         QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByAsc("dep_order").orderByDesc("create_time");
         return departmentMapper.selectCount(queryWrapper);
     }
 
diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
index 391b04c..441305f 100644
--- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
@@ -5,7 +5,7 @@
 <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'
+        select * from department where delete_enum = 'FALSE' order by dep_order, create_time desc
     </select>
 
 </mapper>