From 3e56ecdfa4ba14eaeac61b6efe75bb9ae0eaadff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 二月 2024 09:29:41 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..0b652ac 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
@@ -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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
--
Gitblit v1.9.1