From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治

---
 src/main/resources/mapper/system/SysDeptMapper.xml |   39 +++++++++++++++++++--------------------
 1 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/system/SysDeptMapper.xml b/src/main/resources/mapper/system/SysDeptMapper.xml
index de46729..ee5256f 100644
--- a/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -22,9 +22,9 @@
 		<result property="updateTime" column="update_time" />
 		<result property="staffCount" column="staff_count" />
 	</resultMap>
-
+	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
         from sys_dept d
     </sql>
 
@@ -49,9 +49,9 @@
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
 		${params.dataScope}
 		group by d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
-		order by d.parent_id asc, d.order_num asc, d.create_time desc
+		order by d.parent_id, d.order_num
 	</select>
-
+    
     <select id="selectDeptListByRoleId" resultType="java.lang.Long">
 		select d.dept_id
 		from sys_dept d
@@ -60,40 +60,39 @@
             <if test="deptCheckStrictly">
               and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
             </if>
-		order by d.parent_id asc, d.order_num asc, d.create_time desc
+		order by d.parent_id, d.order_num
 	</select>
-
+    
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
 			d.dept_nick
 		from sys_dept d
 		where d.dept_id = #{deptId}
-		order by d.create_time desc
 	</select>
-
+    
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
 		select count(1) from sys_user_dept where dept_id = #{deptId}
 	</select>
-
+	
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
 		select count(1) from sys_dept
 		where del_flag = '0' and parent_id = #{deptId} limit 1
 	</select>
-
+	
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select * from sys_dept where find_in_set(#{deptId}, ancestors)
 	</select>
-
+	
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
 		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
 	</select>
-
+	
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' order by d.create_time desc limit 1
+		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
-
+    
     <insert id="insertDept" parameterType="com.ruoyi.project.system.domain.SysDept">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -123,7 +122,7 @@
  			sysdate()
  		)
 	</insert>
-
+	
 	<update id="updateDept" parameterType="com.ruoyi.project.system.domain.SysDept">
  		update sys_dept
  		<set>
@@ -141,7 +140,7 @@
  		</set>
  		where dept_id = #{deptId}
 	</update>
-
+	
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	    update sys_dept set ancestors =
 	    <foreach collection="depts" item="item" index="index"
@@ -154,14 +153,14 @@
 	        #{item.deptId}
 	    </foreach>
 	</update>
-
+	 
 	<update id="updateDeptStatusNormal" parameterType="Long">
- 	    update sys_dept set status = '0' where dept_id in
+ 	    update sys_dept set status = '0' where dept_id in 
  	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
         	#{deptId}
         </foreach>
 	</update>
-
+	
 	<delete id="deleteDeptById" parameterType="Long">
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
@@ -185,4 +184,4 @@
 		WHERE parent_id = 100;
 	</select>
 
-</mapper>
+</mapper> 
\ No newline at end of file

--
Gitblit v1.9.3