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 |   67 ++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 15 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 e97cc14..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
@@ -60,6 +60,9 @@
     private SysUserRoleMapper userRoleMapper;
 
     @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
     private SysUserPostMapper userPostMapper;
 
     @Autowired
@@ -132,6 +135,11 @@
         return userMapper.selectUserByUserName(userName);
     }
 
+    @Override
+    public SysUser selectUserByNickName(String nickName) {
+        return userMapper.selectUserByNickName(nickName);
+    }
+
     /**
      * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
      * 
@@ -189,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;
@@ -254,6 +273,7 @@
     @Override
     public void checkUserDataScope(Long userId)
     {
+        //鍒ゆ柇鏄惁鏄鐞嗗憳
         if (!SysUser.isAdmin(SecurityUtils.getUserId()))
         {
             SysUser user = new SysUser();
@@ -296,7 +316,16 @@
     @Override
     public boolean registerUser(SysUser user)
     {
-        return userMapper.insertUser(user) > 0;
+        int satisfyCount = userMapper.insertUser(user);
+        if (satisfyCount > 0) {
+            List<SysUserRole> roleList = new ArrayList<>();
+            SysUserRole roleId = new SysUserRole();
+            roleId.setUserId(user.getUserId());
+            roleId.setRoleId(2L);
+            roleList.add(roleId);
+            sysUserRoleMapper.batchUserRole(roleList);
+        }
+        return satisfyCount > 0;
     }
 
     /**
@@ -311,9 +340,9 @@
     {
         Long userId = user.getUserId();
         // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
-        insertUserRole(user);
+//        userRoleMapper.deleteUserRoleByUserId(userId);
+//        // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+//        insertUserRole(user);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
         userPostMapper.deleteUserPostByUserId(userId);
         // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
@@ -471,7 +500,7 @@
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
         userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        return userMapper.deleteById(userId);
     }
 
     /**
@@ -494,22 +523,22 @@
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
         userPostMapper.deleteUserPost(userIds);
         //鎵惧埌鐢ㄦ埛鍚�
-        List<String> unames = findUserNames(userIds);
-        for(String name :unames) {
+
+        for(long uid : userIds) {
           //  System.out.println(name.equals(""));
          //   System.out.println(name==null);
 
          //   if(name!="" || name != null) {
-                ZInfoUser fs = new ZInfoUser();
-                fs.setNickName(name);
-                List<ZInfoUser> lis = zInfoUserService.selectByCondition(fs);
-                System.out.println("902");
+                ZInfoUser fs = zInfoUserService.getInfoBysysId(uid);
 
-                System.out.println(lis.size());
-                if (!name.equals("") && lis.size() > 0)
-                    userMapper.deleteUserByUserName(name);
+                if(fs!=null)
+                {
+                    userMapper.deleteUserById(uid);
+                }
                 else
-                    userMapper.deleteUserByName(name);
+                {
+                    userMapper.deleteById(uid);
+                }
           //  }
         }
 
@@ -538,6 +567,8 @@
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
+        List<SysUserRole> roleList = new ArrayList<>();
+
         for (SysUser user : userList)
         {
             try
@@ -550,7 +581,12 @@
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     this.insertUser(user);
+                    SysUserRole roleId = new SysUserRole();
+                    roleId.setUserId(user.getUserId());
+                    roleId.setRoleId(2L);
+                    roleList.add(roleId);
                     successNum++;
+
                     successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
                 }
                 else if (isUpdateSupport)
@@ -577,6 +613,7 @@
                 log.error(msg, e);
             }
         }
+        sysUserRoleMapper.batchUserRole(roleList);
         if (failureNum > 0)
         {
             failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");

--
Gitblit v1.9.1