From dc8bccd8445175ef673d24533e95eb4596c7a231 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 28 二月 2025 15:23:02 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 477a6ee..17ba3a3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -230,12 +230,9 @@
left join sys_role r on r.role_id = ur.role_id
left join t_dept_to_user tdtu on u.user_id = tdtu.user_id
WHERE u.del_flag = 0
- <if test="query.nickNameAndPhone != null and query.nickNameAndPhone != ''">
- AND (u.nick_name LIKE concat('%',#{query.nickNameAndPhone},'%')
- OR u.phonenumber LIKE concat('%',#{query.nickNameAndPhone},'%'))
- </if>
- <if test="query.roleId != null">
- AND r.role_id = #{query.roleId}
+ <if test="query.nickNameOrPhone != null and query.nickNameOrPhone != ''">
+ AND (u.nick_name LIKE concat('%',#{query.nickNameOrPhone},'%')
+ OR u.phonenumber LIKE concat('%',#{query.nickNameOrPhone},'%'))
</if>
<if test="query.status != null and query.status != ''">
AND u.status = #{query.status}
@@ -246,6 +243,12 @@
#{deptId}
</foreach>)
</if>
+ <if test="query.roleIds != null and query.roleIds.size()>0">
+ AND r.role_id IN
+ <foreach collection="query.roleIds" close=")" open="(" item="roleId" separator=",">
+ #{roleId}
+ </foreach>
+ </if>
ORDER BY u.create_time DESC
</select>
<select id="selectIdByPhone" resultType="java.lang.Long">
--
Gitblit v1.7.1