From 17afbc2125b4df86f9d7846c02ddc7bc4a8ccc99 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 16:48:47 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 fa44b77..931eb31 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
@@ -123,6 +123,7 @@
RoleInfoVO roleInfoVo = new RoleInfoVO();
roleInfoVo.setRoleId(role.getRoleId());
roleInfoVo.setRoleName(role.getRoleName());
+ roleInfoVo.setRemark(role.getRemark());
// 获取当前角色的菜单列表
List<SysMenu> menus = menuService.selectListByRoleId(roleId);
@@ -132,7 +133,7 @@
List<Long> menusId = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
// 获取当前的权限菜单(有层级)
- List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
+// List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
roleInfoVo.setMenus(menusId);
return AjaxResult.success(roleInfoVo);
@@ -178,6 +179,10 @@
if (flag){
return error("修改角色'" + dto.getRoleName() + "'失败，角色名称已存在");
}
+ SysRole sysRole = roleService.selectRoleById(dto.getRoleId());
+ if("meal".equals(sysRole.getRoleKey()) || "sale".equals(sysRole.getRoleKey()) || "admin".equals(sysRole.getRoleKey())){
+ return error("当前角色无法修改");
+ }
if (roleService.editRole(dto) > 0)
{
// 更新缓存用户权限
@@ -215,6 +220,10 @@
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role)
{
+ SysRole sysRole = roleService.selectRoleById(role.getRoleId());
+ if("meal".equals(sysRole.getRoleKey()) || "sale".equals(sysRole.getRoleKey()) || "admin".equals(sysRole.getRoleKey())){
+ return error("当前角色无法修改状态");
+ }
role.setUpdateBy(getUsername());
roleService.updateStatus(role);
return AjaxResult.success();
@@ -224,7 +233,23 @@
* 删除角色
*/
// @PreAuthorize("@ss.hasPermi('system:role:remove')")
- @ApiOperation(value = "删除角色")
+// @ApiOperation(value = "批量删除角色")
+// @Log(title = "角色信息-角色删除角色", businessType = BusinessType.DELETE)
+// @DeleteMapping("/deleteById/{id}")
+// public AjaxResult remove(@PathVariable(value = "id") Long id)
+// {
+// SysRole sysRole = roleService.selectRoleById(id);
+// if("meal".equals(sysRole.getRoleKey()) || "sale".equals(sysRole.getRoleKey()) || "admin".equals(sysRole.getRoleKey())){
+// return error("当前角色无法删除");
+// }
+// return AjaxResult.success(roleService.deleteRoleById(id));
+// }
+
+ /**
+ * 删除角色
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:remove')")
+ @ApiOperation(value = "批量删除角色")
@Log(title = "角色信息-角色删除角色", businessType = BusinessType.DELETE)
@DeleteMapping("/deleteById/{ids}")
public AjaxResult remove(@PathVariable String ids)
--
Gitblit v1.7.1