From bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 十一月 2024 18:50:47 +0800
Subject: [PATCH] 生成数据明细导出修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 087fea1..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);
@@ -232,17 +233,17 @@
* 删除角色
*/
// @PreAuthorize("@ss.hasPermi('system:role:remove')")
- @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));
- }
+// @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));
+// }
/**
* 删除角色
--
Gitblit v1.7.1