From facbb7f28fb613b84ce1529c0bf63f1b77e576e5 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 15 八月 2024 20:28:52 +0800 Subject: [PATCH] update 优化 个人中心编辑 忽略数据权限 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index a474ed3..d4a9dc8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -79,6 +79,7 @@ @Log(title = "瑙掕壊绠$悊", businessType = BusinessType.INSERT) @PostMapping public R<Void> add(@Validated @RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); if (!roleService.checkRoleNameUnique(role)) { return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪"); } else if (!roleService.checkRoleKeyUnique(role)) { @@ -148,11 +149,13 @@ /** * 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛� + * + * @param roleIds 瑙掕壊ID涓� */ @SaCheckPermission("system:role:query") @GetMapping("/optionselect") - public R<List<SysRoleVo>> optionselect() { - return R.ok(roleService.selectRoleAll()); + public R<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) { + return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); } /** -- Gitblit v1.9.3