From 1b137a662cf48ddad94b48de606ac36061fac4dd Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期二, 25 八月 2026 10:00:11 +0800
Subject: [PATCH] feat 用户角色菜单配置相关功能

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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 89a84f6..0d4fc81 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -1,10 +1,8 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -135,7 +133,13 @@
     @Override
     public SysRole selectRoleById(Long roleId)
     {
-        return roleMapper.selectRoleById(roleId);
+        SysRole role = roleMapper.selectRoleById(roleId);
+
+        List<SysRoleMenu> menus =roleMenuMapper.selectByRoleId(roleId);
+        if(CollectionUtils.isNotEmpty(menus)) {
+            role.setMenuIds(menus.stream().map(SysRoleMenu::getMenuId).toArray(Long[]::new));
+        }
+        return role;
     }
 
     /**
@@ -233,6 +237,7 @@
     @Transactional
     public int insertRole(SysRole role)
     {
+        role.setRoleKey(role.getRoleName());
         // 新增角色信息
         roleMapper.insertRole(role);
         return insertRoleMenu(role);
@@ -248,6 +253,7 @@
     @Transactional
     public int updateRole(SysRole role)
     {
+        role.setRoleKey(role.getRoleName());
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与菜单关联

--
Gitblit v1.7.1