From 34e183fbfed4688f25b375d4966b937f52228827 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 17 六月 2024 10:34:19 +0800
Subject: [PATCH] 报错
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 1add0e0..47a6f42 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -76,7 +76,7 @@
@ApiOperation("权限列表查询")
@GetMapping("/listPage")
- public AjaxResult<PageInfo<SysRoleVO> > listPage(String roleName,int pageNumber,int pageSize)
+ public AjaxResult<PageInfo<SysRole> > listPage(String roleName,int pageNumber,int pageSize)
{
PageInfo<SysRole> pageInfo = new PageInfo<>(pageNumber, pageSize);
LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<>();
@@ -104,6 +104,7 @@
res1.setTotal(res.size());
return AjaxResult.success(res1);
}
+
@ApiOperation("添加角色")
@PostMapping("/roleAdd")
@@ -178,9 +179,9 @@
// 获取所有菜单ids
List<Long> menusId1 = menuMapper.selectList(new LambdaQueryWrapper<SysMenu>()).stream().map(SysMenu::getMenuId).collect(Collectors.toList());
-// if(menusId.size()==0){
-// return AjaxResult.success(new ArrayList<>());
-// }
+ if(CollectionUtils.isEmpty(menusId)){
+ return AjaxResult.success(new ArrayList<>());
+ }
//获取所有的权限菜单
List<SysMenus> all = menuMapper.getAllInIds(menusId1);
@@ -228,10 +229,11 @@
role.setRoleId(dto.getRoleId());
roleService.updateRole(role);
ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
- List<Long> menuIds = dto.getMenuIds();
+
// 移除原来的权限菜单
sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
.eq(SysRoleMenu::getRoleId,dto.getRoleId()));
+ List<Long> menuIds = dto.getMenuIds();
for (Long menuId : menuIds) {
SysRoleMenu sysRoleMenu = new SysRoleMenu();
sysRoleMenu.setMenuId(menuId);
--
Gitblit v1.7.1