From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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 4b35655..54c4a1c 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
@@ -254,6 +257,7 @@
     @Override
     public void checkUserDataScope(Long userId)
     {
+        //鍒ゆ柇鏄惁鏄鐞嗗憳
         if (!SysUser.isAdmin(SecurityUtils.getUserId()))
         {
             SysUser user = new SysUser();
@@ -296,8 +300,16 @@
     @Override
     public boolean registerUser(SysUser user)
     {
-        System.out.println(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;
     }
 
     /**
@@ -472,7 +484,7 @@
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
         userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        return userMapper.deleteById(userId);
     }
 
     /**
@@ -539,6 +551,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
@@ -551,7 +565,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)
@@ -578,6 +597,7 @@
                 log.error(msg, e);
             }
         }
+        sysUserRoleMapper.batchUserRole(roleList);
         if (failureNum > 0)
         {
             failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝g‘锛岄敊璇涓嬶細");

--
Gitblit v1.9.1