From d0850c1c55c5f709874cde1b5f292813fbd3af5e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 12:12:59 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 217fea0..1b9b534 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -135,6 +135,11 @@
         return userMapper.selectUserByUserName(userName);
     }
 
+    @Override
+    public SysUser selectUserByNickName(String nickName) {
+        return userMapper.selectUserByNickName(nickName);
+    }
+
     /**
      * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
      * 
@@ -192,6 +197,17 @@
     {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    @Override
+    public boolean checkNickNameUnique(SysUser user) {
+        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        SysUser info = userMapper.checkNickNameUnique(user.getNickName());
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
         {
             return UserConstants.NOT_UNIQUE;
@@ -257,6 +273,7 @@
     @Override
     public void checkUserDataScope(Long userId)
     {
+        //鍒ゆ柇鏄惁鏄鐞嗗憳
         if (!SysUser.isAdmin(SecurityUtils.getUserId()))
         {
             SysUser user = new SysUser();
@@ -569,7 +586,7 @@
                     roleId.setRoleId(2L);
                     roleList.add(roleId);
                     successNum++;
-                    
+
                     successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
                 }
                 else if (isUpdateSupport)

--
Gitblit v1.9.1