From 33c23179242edf5aa0cb7dd04f8a35b2c188eb52 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期四, 12 六月 2025 15:19:21 +0800
Subject: [PATCH] 06-11 zhs

---
 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index c13724f..e2b39f7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -79,7 +79,7 @@
         </if>
         <!-- 鏁版嵁鑼冨洿杩囨护 -->
         ${params.dataScope}
-        order by d.parent_id, d.order_num
+        order by d.dept_type asc, d.parent_id, d.order_num
     </select>
 
     <select id="selectDeptListByRoleId" resultType="Long">
@@ -107,7 +107,7 @@
                d.email,
                d.status,
                d.his_dept_id,
-               d.his_parent_id
+               d.his_parent_id,
                (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
         from sys_dept d
         where d.dept_id = #{deptId}

--
Gitblit v1.9.3