From 7147f81b427387418e108264d0ad6de93bc94c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 4 Jul 2025 17:42:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRoleServiceImpl.java      | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
index d6f1e7e79..985743dbe 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
@@ -4,7 +4,6 @@ import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -40,7 +39,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 角色 业务层处理
@@ -357,18 +355,19 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      * @param role 角色对象
      */
     private int insertRoleMenu(SysRoleBo role) {
-        Long[] menuIds = role.getMenuIds();
-        if (ArrayUtil.isEmpty(menuIds)) {
-            return 0;
+        int rows = 1;
+        // 新增用户与角色管理
+        List<SysRoleMenu> list = new ArrayList<>();
+        for (Long menuId : role.getMenuIds()) {
+            SysRoleMenu rm = new SysRoleMenu();
+            rm.setRoleId(role.getRoleId());
+            rm.setMenuId(menuId);
+            list.add(rm);
         }
-        List<SysRoleMenu> roleMenuList = Arrays.stream(menuIds)
-            .map(menuId -> {
-                SysRoleMenu roleMenu = new SysRoleMenu();
-                roleMenu.setRoleId(role.getRoleId());
-                roleMenu.setMenuId(menuId);
-                return roleMenu;
-            }).collect(Collectors.toList());
-        return roleMenuMapper.insertBatch(roleMenuList) ? roleMenuList.size() : 0;
+        if (CollUtil.isNotEmpty(list)) {
+            rows = roleMenuMapper.insertBatch(list) ? list.size() : 0;
+        }
+        return rows;
     }
 
     /**
@@ -377,18 +376,19 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      * @param role 角色对象
      */
     private int insertRoleDept(SysRoleBo role) {
-        Long[] deptIds = role.getDeptIds();
-        if (ArrayUtil.isEmpty(deptIds)) {
-            return 0;
+        int rows = 1;
+        // 新增角色与部门（数据权限）管理
+        List<SysRoleDept> list = new ArrayList<>();
+        for (Long deptId : role.getDeptIds()) {
+            SysRoleDept rd = new SysRoleDept();
+            rd.setRoleId(role.getRoleId());
+            rd.setDeptId(deptId);
+            list.add(rd);
         }
-        List<SysRoleDept> roleDeptList = Arrays.stream(deptIds)
-            .map(deptId -> {
-                SysRoleDept roleDept = new SysRoleDept();
-                roleDept.setRoleId(role.getRoleId());
-                roleDept.setDeptId(deptId);
-                return roleDept;
-            }).collect(Collectors.toList());
-        return roleDeptMapper.insertBatch(roleDeptList) ? roleDeptList.size() : 0;
+        if (CollUtil.isNotEmpty(list)) {
+            rows = roleDeptMapper.insertBatch(list) ? list.size() : 0;
+        }
+        return rows;
     }
 
     /**