From b265007b416705588737a34b01fdb5dbd7f58511 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 15:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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..7f6cd43 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
@@ -105,6 +105,7 @@
return AjaxResult.success(res1);
}
+
@ApiOperation("添加角色")
@PostMapping("/roleAdd")
public AjaxResult roleAdd(@Validated @RequestBody RoleAddDto dto)
@@ -125,7 +126,15 @@
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
roleService.insertRole(role);
-
+ ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
+ List<Long> menuIds = dto.getMenuIds();
+ for (Long menuId : menuIds) {
+ SysRoleMenu sysRoleMenu = new SysRoleMenu();
+ sysRoleMenu.setMenuId(menuId);
+ sysRoleMenu.setRoleId(role.getRoleId());
+ sysRoleMenus.add(sysRoleMenu);
+ }
+ sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
return AjaxResult.success();
}
@@ -228,10 +237,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