From 6bc2d74ca9a45d3061b607e690548eacda74833a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 14:34:35 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/role/components/scope.jsx | 3 ++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 17 ++++++++++++++---
zy-asrs-flow/src/pages/system/role/index.jsx | 11 +++++++++--
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/role/components/scope.jsx b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
index 253e6ac..36c923f 100644
--- a/zy-asrs-flow/src/pages/system/role/components/scope.jsx
+++ b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
@@ -9,7 +9,7 @@
const Scope = (props) => {
const [form] = Form.useForm();
- const { } = props;
+ const { originMenuIds } = props;
const [menuTreeLoading, setMenuTreeLoading] = useState(false);
const [menuTreeData, setMenuTreeData] = useState([]);
const [menuExpandedKeys, setMenuExpandedKeys] = useState([]);
@@ -32,6 +32,7 @@
}
useEffect(() => {
+ setMenuIds(originMenuIds);
form.resetFields();
form.setFieldsValue({
...props.values
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index c1485b1..7380cf2 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -116,6 +116,7 @@
const [searchParam, setSearchParam] = useState({});
const [scopeModalVisible, setScopeModalVisible] = useState(false);
+ const [menuIds, setMenuIds] = useState([]);
useEffect(() => {
@@ -205,8 +206,13 @@
type="link"
key="scope"
onClick={() => {
- setScopeModalVisible(true);
- setCurrentRow(record);
+ Http.doGetPromise('/api/role/scope/list', { roleId: record.id }, (res) => {
+ if (res.data) {
+ setMenuIds(res.data);
+ }
+ setScopeModalVisible(true);
+ setCurrentRow(record);
+ });
}}
>
鍒嗛厤鏉冮檺
@@ -391,6 +397,7 @@
<Scope
open={scopeModalVisible}
values={currentRow || {}}
+ originMenuIds={menuIds}
onCancel={
() => {
setScopeModalVisible(false);
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 7907f50..4d933c9 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
@@ -21,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2/13/2024
@@ -131,12 +132,22 @@
ExcelUtil.build(ExcelUtil.create(roleService.list(), Role.class), response);
}
+ @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();
+ }
+
@PreAuthorize("hasAuthority('system:role:update')")
@OperationLog("鍒嗛厤鏉冮檺")
- @PostMapping("/role/scope")
- public R scope(@RequestBody Role role) {
+ @PostMapping("/role/scope/update")
+ public R scopeUpdate(@RequestBody Role role) {
-
+
return R.ok("鍒嗛厤鎴愬姛");
}
--
Gitblit v1.9.1