From e2fea9f7f25d1f850720a9ca1fa983e944b299b0 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 25 五月 2026 10:27:59 +0800
Subject: [PATCH] feat(production):添加成品名称查询
---
src/main/resources/mapper/system/SysUserMapper.xml | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 441fd9a..16b0d40 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,7 @@
<result property="remark" column="remark" />
<result property="deptNames" column="dept_names" />
<result property="tenantId" column="tenant_id" />
+ <result property="roleIdsStr" column="role_ids_str" />
<association property="dept" javaType="com.ruoyi.project.system.domain.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -56,7 +57,7 @@
</sql>
<select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
+ select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.tenant_id, T2.dept_names, T3.role_ids_str from sys_user u
left join
( SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
FROM
@@ -69,6 +70,11 @@
</where>
GROUP BY T1.user_id
) T2 on T2.user_id = u.user_id
+ left join
+ ( SELECT ur.user_id, GROUP_CONCAT(ur.role_id) AS role_ids_str
+ FROM sys_user_role ur
+ GROUP BY ur.user_id
+ ) T3 on T3.user_id = u.user_id
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
@@ -88,7 +94,7 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
</if>
- <if test="params.deptId != null">
+ <if test="deptId != null">
AND u.user_id IN
(
SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
@@ -139,6 +145,7 @@
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
+ and u.del_flag = '0'
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -154,20 +161,25 @@
</select>
<select id="selectUserByIds" resultType="com.ruoyi.project.system.domain.SysUser">
<include refid="selectUserVo"/>
- where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ <where>
+ u.del_flag = '0'
+ <if test="userIds != null and userIds.size() > 0">
+ and u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </where>
</select>
- <select id="selectList" resultType="com.ruoyi.project.system.domain.SysUser">
+ <select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
SELECT user_id, nick_name FROM sys_user
<where>
- <if test="list != null and list.size() > 0">
+ <if test="registrantIds != null and registrantIds.size() > 0">
user_id IN
- <foreach item="id" collection="list" open="(" separator="," close=")">
+ <foreach item="id" collection="registrantIds" open="(" separator="," close=")">
#{id}
</foreach>
</if>
- <if test="list == null or list.size() == 0">
+ <if test="registrantIds == null or registrantIds.size() == 0">
1=0 <!-- 绌哄垪琛ㄦ椂杩斿洖绌虹粨鏋� -->
</if>
</where>
@@ -179,6 +191,7 @@
<foreach collection="userIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
+ and del_flag = '0'
</select>
<select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
parameterType="java.lang.String">
@@ -190,7 +203,6 @@
<insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
- <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="email != null and email != ''">email,</if>
@@ -205,7 +217,6 @@
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</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>
<if test="email != null and email != ''">#{email},</if>
--
Gitblit v1.9.3