From 30f4353413b89836f7b7eea37da74be3cecea6bc Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 30 Sep 2025 15:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/system/mapper/SysUserMapper.java  | 4 ++--
 .../com/bonus/system/service/impl/SysUserServiceImpl.java | 2 +-
 .../src/main/resources/mapper/system/SysUserMapper.xml    | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
index 06c08ca..c1c6aea 100644
--- a/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
+++ b/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
@@ -104,10 +104,10 @@ public interface SysUserMapper
     /**
      * 校验用户名称是否唯一
      *
-     * @param userName 用户名称
+     * @param
      * @return 结果
      */
-    public SysUser checkUserNameUnique(String userName);
+    public SysUser checkUserNameUnique(SysUser sysUser);
 
     /**
      * 校验手机号码是否唯一
diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
index 6b507c3..94525fb 100644
--- a/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
+++ b/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
@@ -170,7 +170,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     public boolean checkUserNameUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+        SysUser info = userMapper.checkUserNameUnique(user);
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
diff --git a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 343f3ed..0471064 100644
--- a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -141,8 +141,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, user_name from da_ky_sys_user where user_name = #{userName} and del_flag = '0' limit 1
-	</select>
+        select user_id, user_name from da_ky_sys_user where user_name = #{userName}
+        <if test="userId != null">
+            and user_id != #{userId}
+        </if>
+        and del_flag = '0' limit 1
+    </select>
 
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from da_ky_sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1