#

luxiaotao1123

2024-02-22 6bc2d74ca9a45d3061b607e690548eacda74833a

#

 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

 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);

 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("分配成功");
    }