代码提交

bonus-admin/src/main/java/com/bonus/web/controller/system/SysUserController.java

@@ -170,7 +170,7 @@ public class SysUserController extends BaseController {
      */
     @RequiresPermissions("system:user:remove")
     @SysLog(title = "用户管理", businessType = OperaType.DELETE, logType = 1, module = "系统管理->用户管理", details = "删除用户")
-    @PostMapping("delUser")
+    @PostMapping("del")
     public AjaxResult remove(@RequestBody SysUser user) {
         if (user.getUserId().equals(getUserId()) ) {
             return error("当前用户不能删除");

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);
 
     /**
      * 校验手机号码是否唯一

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;
         }

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