所有传orgId的地方修改
This commit is contained in:
@@ -44,6 +44,7 @@ export default function UserRolePage() {
|
||||
const [rolesOption, setRolesOption] = useState([]);
|
||||
const [selectedUserIds, setSelectedUserIds] = useState<number[]>([]);
|
||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||
const { currentStation, stationId } = useSelector((state: RootState) => state.station);
|
||||
const [orgList, setOrgList] = useState([]);
|
||||
const [siteList, setSiteList] = useState([]);
|
||||
// 全局缓存:所有场站(用于表格展示)
|
||||
@@ -127,8 +128,8 @@ export default function UserRolePage() {
|
||||
const params = {
|
||||
pageNum: userPagination.pageNum,
|
||||
pageSize: userPagination.pageSize,
|
||||
orgId: userInfo?.orgId,
|
||||
siteId: userInfo?.siteId,
|
||||
orgId: currentStation?.orgId,
|
||||
siteId: stationId,
|
||||
};
|
||||
getUser(params).then(res => {
|
||||
if (res.code === 200) {
|
||||
@@ -164,7 +165,7 @@ export default function UserRolePage() {
|
||||
useEffect(() => {
|
||||
getUserData();
|
||||
getRoleForSelect();
|
||||
}, [userPagination.pageNum, userPagination.pageSize]);
|
||||
}, [userPagination.pageNum, userPagination.pageSize, stationId]);
|
||||
|
||||
// ====================== 角色操作 ======================
|
||||
const handleAddRole = () => {
|
||||
@@ -274,8 +275,8 @@ export default function UserRolePage() {
|
||||
setSiteList([]);
|
||||
form.resetFields();
|
||||
|
||||
const defaultOrgId = userInfo?.orgId ?? '';
|
||||
const defaultSiteId = userInfo?.siteId ?? '';
|
||||
const defaultOrgId = currentStation?.orgId ?? '';
|
||||
const defaultSiteId = stationId ?? '';
|
||||
|
||||
form.setFieldsValue({
|
||||
orgId: defaultOrgId,
|
||||
|
||||
Reference in New Issue
Block a user