From 25b19e60e004290531f61fdf608d1adb5e531903 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:40:12 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 62b9c59..5108cf7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -144,15 +144,14 @@
roleInfoVo.setRoleType(role.getRoleType());
// 获取当前角色的菜单列表
List<SysMenu> menus = menuService.selectListByRoleId(roleId);
- if(menus.size()==0){
- return AjaxResult.success(new ArrayList<>());
- }
List<Long> menusId = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
-
// 获取当前的权限菜单(有层级)
- List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
-
- roleInfoVo.setMenus(menusId);
+ if (!menusId.isEmpty()){
+ List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
+ roleInfoVo.setMenus(menusId);
+ }else{
+ roleInfoVo.setMenus(new ArrayList<>());
+ }
return AjaxResult.success(roleInfoVo);
}
--
Gitblit v1.7.1