From 3b5b47c0a839c2245d045f93cff916db701dcb5d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 14 二月 2025 13:31:04 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7336905..7487409 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -228,19 +228,24 @@
from sys_user u
left join sys_user_role ur on u.user_id = ur.user_id
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.nickName != null and query.nickName != ''">
- AND u.nick_name LIKE concat('%',#{query.nickName},'%')
+ <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>
- <if test="query.phonenumber != null and query.phonenumber != ''">
- AND u.phonenumber LIKE concat('%',#{query.phonenumber},'%')
- </if>
<if test="query.status != null and query.status != ''">
AND u.status = #{query.status}
</if>
+ <if test="query.deptIds != null and query.deptIds.size()>0">
+ AND u.user_id IN (select DISTINCT user_id from t_dept_to_user where dept_id IN
+ <foreach collection="query.deptIds" close=")" open="(" item="deptId" separator=",">
+ #{deptId}
+ </foreach>)
+ </if>
ORDER BY u.create_time DESC
</select>
<select id="selectIdByPhone" resultType="java.lang.Long">
--
Gitblit v1.7.1