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 | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0b30ccc..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" />
@@ -25,7 +26,9 @@
<result property="remark" column="remark" />
<result property="nameEn" column="name_en" />
<result property="signatureUrl" column="signature_url" />
+ <result property="pictureUrl" column="picture_url" />
<result property="company" column="company" />
+ <result property="roleName" column="role_name" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -60,8 +63,29 @@
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
- select u.id, u.dept_id, u.name, u.account, u.email, u.picture_url, u.phone, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from user u
+ select u.id,
+ u.sort,
+ u.dept_id,
+ u.name,
+ u.account,
+ u.email,
+ u.picture_url,
+ u.phone,
+ u.sex,
+ u.status,
+ u.del_flag,
+ u.login_ip,
+ u.login_date,
+ u.create_by,
+ u.create_time,
+ u.remark,
+ d.dept_name,
+ d.leader,
+ GROUP_CONCAT(DISTINCT sr.role_name SEPARATOR ',') AS role_name
+ from user u
left join sys_dept d on u.dept_id = d.dept_id
+ left join sys_user_role sur on sur.user_id = u.id
+ left join sys_role sr on sr.role_id = sur.role_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.id = #{userId}
@@ -87,8 +111,10 @@
<if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
+ group by u.id
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
+ ORDER BY u.sort
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
@@ -151,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>
@@ -168,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>
@@ -204,6 +232,7 @@
<if test="remark != null">remark = #{remark},</if>
<if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
<if test="signatureUrl != null and signatureUrl != ''">signature_url = #{signatureUrl},</if>
+ <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
<if test="company != null and company != ''">company = #{company},</if>
update_time = sysdate()
</set>
@@ -222,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