From 09fde94b4790b90dccf35a24f6d3d1d2171b59dd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 10:26:40 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 884fb4b..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
@@ -25,7 +25,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2/13/2024
@@ -44,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')")
@@ -139,11 +138,11 @@
@PreAuthorize("hasAuthority('system:role:list')")
@GetMapping("/role/scope/list")
public R scopeList(@RequestParam Long roleId) {
- List<RoleMenu> list = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
- if (!Cools.isEmpty(list)) {
- return R.ok().add(list.stream().map(RoleMenu::getMenuId).collect(Collectors.toList()));
- }
- return R.ok();
+// List<RoleMenu> list = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId));
+// if (!Cools.isEmpty(list)) {
+// return R.ok().add(list.stream().map(RoleMenu::getMenuId).collect(Collectors.toList()));
+// }
+ return R.ok().add(roleMenuService.listStrictlyMenuByRoleId(roleId));
}
@PreAuthorize("hasAuthority('system:role:update')")
@@ -154,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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
@@ -162,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