From 1fb4735cf75f6b98b8d81611a95ccea395cba323 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 四月 2026 16:35:04 +0800
Subject: [PATCH] 绩效模块调整

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index ce30170..f42cd75 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -6,6 +6,7 @@
 
     <resultMap type="SysUser" id="SysUserResult">
         <id     property="userId"       column="id"      />
+        <result property="sort"       column="sort"      />
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="account"    />
         <result property="nickName"     column="name"    />
@@ -63,6 +64,7 @@
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.id,
+		u.sort,
 		u.dept_id,
 		u.name,
 		u.account,
@@ -112,6 +114,7 @@
 		group by u.id
 		<!-- 鏁版嵁鑼冨洿杩囨护 -->
 		${params.dataScope}
+		ORDER BY u.sort
 	</select>
 
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -174,6 +177,7 @@
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into user(
  			<if test="userId != null and userId != 0">id,</if>
+ 			<if test="sort != null and sort != ''">sort,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">account,</if>
  			<if test="nickName != null and nickName != ''">`name`,</if>
@@ -191,6 +195,7 @@
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
+ 			<if test="sort != null and sort != ''">#{sort},</if>
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="nickName != null and nickName != ''">#{nickName},</if>
@@ -246,7 +251,7 @@
  		update user set password = #{password} where account = #{userName}
 	</update>
 
-	<delete id="deleteUserById" parameterType="Long">
+    <delete id="deleteUserById" parameterType="Long">
  		update user set del_flag = '2' where id = #{userId}
  	</delete>
 

--
Gitblit v1.9.3