From a464d90712d61ac7ac23bf3af3c32c897b484b15 Mon Sep 17 00:00:00 2001
From: chenyuxi <chenyuxi@wanxin-holdings.com>
Date: Wed, 26 Feb 2025 17:32:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yifu/admin/api/vo/DeptTreeSelectVO.java               | 3 +++
 .../v1/yifu/admin/service/impl/SysDeptServiceImpl.java    | 1 +
 .../src/main/resources/mapper/SysDeptMapper.xml           | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/DeptTreeSelectVO.java b/yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/DeptTreeSelectVO.java
index 456d184d3..6b9cff9b6 100644
--- a/yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/DeptTreeSelectVO.java
+++ b/yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/DeptTreeSelectVO.java
@@ -44,6 +44,8 @@ public class DeptTreeSelectVO implements Serializable {
 	 */
 	private  String peopleNum;
 
+	private Integer sortOrder;
+
 
 	private List<DeptTreeSelectVO> children;
 
@@ -52,6 +54,7 @@ public class DeptTreeSelectVO implements Serializable {
 		this.parentId = dept.getParentId();
 		this.ancestors = dept.getAncestors();
 		this.name = dept.getName();
+		this.sortOrder = dept.getSortOrder();
 		this.parentName = dept.getParentName();
 		this.peopleNum =dept.getPeopleNum();
 		if(dept.getChildren() != null){
diff --git a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
index 46af1aa3d..50209b7c6 100644
--- a/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
+++ b/yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysDeptServiceImpl.java
@@ -439,6 +439,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 					return R.failed("父级部门未找到");
 				}
 				if (Common.isNotNull(info.getAncestors())){
+					// todo 商量是否加这个限制
 					String[] split = info.getAncestors().split(",");
 					if (split.length >= 6){
 						return R.failed("添加部门的层级超出限制,最多支持5级");
diff --git a/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
index d4b18026b..44a6ff792 100644
--- a/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
+++ b/yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysDeptMapper.xml
@@ -64,7 +64,7 @@
 	</select>
 
 	<select id="cspDeptList" resultType="com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo">
-		select d.dept_id, d.name, d.parent_id,d.ancestors
+		select d.dept_id, d.name, d.parent_id,d.ancestors,sort_order
 		from sys_dept d
 		where d.del_flag = '0'
 		<if test="dept.projectNo != null and dept.projectNo != ''">
@@ -79,18 +79,18 @@
 		<if test="dept.name != null and dept.name != ''">
 			AND d.name like concat('%', #{dept.name}, '%')
 		</if>
-		order by d.create_time asc
+		order by d.create_time desc,d.sort_order asc
 	</select>
 
 	<select id="cspDeptUserList" resultType="com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo">
-		select d.dept_id, d.name, d.parent_id,d.ancestors,
+		select d.dept_id, d.name, d.parent_id,d.ancestors,sort_order,
 		(select count(*) from sys_user_dept_permission where dept_id = d.dept_id) as peoplenum
 		from sys_dept d
 		where d.del_flag = '0'
 		<if test="dept.projectNo != null and dept.projectNo != ''">
 			AND d.project_no = #{dept.projectNo}
 		</if>
-		order by d.create_time asc
+		order by d.create_time desc,d.sort_order asc
 	</select>
 
 	<select id="checkDeptNameUnique" resultMap="BaseResultMap">
-- 
2.18.1