From 721d99ec58e38a1f586e2bed93cb8f385d1e9bc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 16:21:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
index 74e1f8c..a6316a3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
@@ -113,11 +113,19 @@
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
+ select user_id, user_name from sys_user where user_name = #{userName}
+ <if test="null != objectId">
+ and objectId = #{objectId}
+ </if>
+ and del_flag = '0' limit 1
</select>
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
+ select user_id, phonenumber from sys_user where phonenumber = #{phonenumber}
+ <if test="null != objectId">
+ and objectId = #{objectId}
+ </if>
+ and del_flag = '0' limit 1
</select>
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
@@ -141,6 +149,9 @@
</if>
<if test="null != req.status">
and status = #{req.status}
+ </if>
+ <if test="null != req.objectId">
+ and objectId = #{req.objectId}
</if>
and del_flag = '0' and role_type =1
order by create_time desc
@@ -168,6 +179,9 @@
<if test="query.nickName != null and query.nickName != ''">
AND nick_name LIKE concat('%',#{query.nickName},'%')
</if>
+ <if test="null != query.objectId">
+ and objectId = #{query.objectId}
+ </if>
AND del_flag = '0'
AND role_type = 1
</where>
--
Gitblit v1.7.1