From 66a4d910a33d1273427b513e008bd9cd4c5d4054 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 23 九月 2024 19:04:15 +0800 Subject: [PATCH] 修改接口 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 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..9598468 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 @@ -178,6 +178,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 +219,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 +232,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