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 | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 4d933c9..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
@@ -9,6 +9,7 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.system.controller.param.RoleScopeParam;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.entity.RoleMenu;
import com.zy.asrs.wcs.system.service.RoleMenuService;
@@ -20,8 +21,10 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2/13/2024
@@ -135,20 +138,27 @@
@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')")
@OperationLog("鍒嗛厤鏉冮檺")
@PostMapping("/role/scope/update")
- public R scopeUpdate(@RequestBody Role role) {
-
-
-
+ @Transactional
+ public R scopeUpdate(@RequestBody RoleScopeParam param) {
+ 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ }
return R.ok("鍒嗛厤鎴愬姛");
}
--
Gitblit v1.9.1