From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期四, 17 十月 2024 13:57:29 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java index 98160fb..c96dc48 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java @@ -43,7 +43,7 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Role, BaseParam> pageParam = new PageParam<>(baseParam, Role.class); - return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper(true))); + return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper(true, (wrapper) -> wrapper.orderByAsc("create_time")))); } @PreAuthorize("hasAuthority('system:role:list')") @@ -153,6 +153,7 @@ Long roleId = param.getId(); List<Long> menuIds = new ArrayList<>(param.getMenuIds().getChecked()); menuIds.addAll(param.getMenuIds().getHalfChecked()); + roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId)); for (Long menuId : menuIds) { if (!roleMenuService.save(new RoleMenu(roleId, menuId))) { throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"); @@ -161,4 +162,14 @@ return R.ok("鍒嗛厤鎴愬姛"); } + @PreAuthorize("hasAuthority('system:role:list')") + @GetMapping("/role/list/name/{ids}") + public R listName(@PathVariable Long[] ids) { + List<String> nameList = new ArrayList<>(); + for (Long id : ids) { + nameList.add(roleService.getById(id).getName()); + } + return R.ok().add(nameList); + } + } -- Gitblit v1.9.1