test

src/pages/StationManage.tsx

@@ -198,6 +198,14 @@ export default function StationManage() {
 	const columns = [
 		{ title: '场站名称', dataIndex: 'siteName' },
 		{ title: '场站编号', dataIndex: 'siteCode' },
+		{
+			title: '所属组织',
+			dataIndex: 'orgId',
+			render: (orgId) => {
+				const org = orgList.find(item => item.id == orgId);
+				return org ? org.orgName : '—';
+			}
+		},
 		{ title: '地址', dataIndex: 'address' },
 		{
 			title: '状态',

src/pages/UserPage.tsx

@@ -9,7 +9,7 @@ import {
 } from '@ant-design/icons';
 import { getMenuList } from '../api/mune';
 import { buildPermTree, buildTreeFromFlat } from '../lib/utils';
-import { addRole, deleteRole, editRoleApi, getRoleDetailById, getRoleList } from '../api/role';
+import { addRole, deleteRole, editRoleApi, getRoleAllocate, getRoleDetailById, getRoleList } from '../api/role';
 import { addUser, deleteUser, editUser, getUser } from '../api/user';
 import EmptyData from '../components/Empty';
 import { useSelector } from 'react-redux';
@@ -81,7 +81,9 @@ export default function UserRolePage() {
 		};
 		getRoleList(params).then(res => {
 			if (res.code === 200) {
-				setRoles(res.data || []);
+				// 根据 roleSort 升序排序（越小越靠前）
+				let sortedRoles = (res.data || []).sort((a, b) => (a.roleSort || 999) - (b.roleSort || 999));
+				setRoles(sortedRoles);
 				setRolePagination({
 					...rolePagination,
 					total: res.total || res.data?.length || 0
@@ -105,7 +107,7 @@ export default function UserRolePage() {
 		const params = {
 			pageNum: userPagination.pageNum,
 			pageSize: userPagination.pageSize,
-			userId: userInfo?.userId
+			//userId: userInfo?.userId
 		};
 		getUser(params).then(res => {
 			if (res.code === 200) {
@@ -120,11 +122,14 @@ export default function UserRolePage() {
 
 	// ====================== 获取角色下拉框 ======================
 	const getRoleForSelect = () => {
-		getRoleList({
+		getRoleAllocate({
 			pageNum: 1, pageSize: 1000,
-			//...(userInfo?.roleId && { roleId: userInfo.roleId }),
 		}).then(res => {
-			if (res.code === 200) setRolesOption(res.data || []);
+			if (res.code === 200) {
+
+				let sortedRoles = (res.data || []).sort((a, b) => (a.roleSort || 999) - (b.roleSort || 999));
+				setRolesOption(sortedRoles);
+			}
 		});
 	};
 
@@ -139,7 +144,7 @@ export default function UserRolePage() {
 	// ====================== 初始化加载 ======================
 	useEffect(() => {
 		getMenuData();
-		getRoleById();
+		//getRoleById();
 		getOrgData();
 
 	}, []);
@@ -158,13 +163,17 @@ export default function UserRolePage() {
 		roleForm.resetFields();
 		setCheckedKeys([]);
 		setEditRole(null);
-		roleForm.setFieldsValue({ status: true, roleSort: 1 });
+		// 默认值
+		roleForm.setFieldsValue({ status: true, roleSort: 1, roleLevel: 1 });
 		setRoleModalVisible(true);
 	};
 
 	const handleEditRole = (record) => {
 		setEditRole(record);
-		roleForm.setFieldsValue({ ...record, status: record.status == 1 });
+		roleForm.setFieldsValue({
+			...record,
+			roleLevel: record.roleLevel
+		});
 
 		const getAllLeafKeys = (tree) => {
 			let leaves = [];
@@ -239,8 +248,9 @@ export default function UserRolePage() {
 			const params = {
 				...values,
 				menuIds: allMenuIds,
-				status: values.status ? 1 : 0,
+				status: 1,
 				roleSort: values.roleSort || 1,
+				roleLevel: values.roleLevel // ✅ 提交用下划线
 			};
 			if (editRole) params.roleId = editRole.roleId;
 
@@ -249,7 +259,7 @@ export default function UserRolePage() {
 				if (res.code == 200) {
 					messageApi.success(editRole ? '编辑成功' : '新增成功');
 					setRoleModalVisible(false);
-					getRoleById();
+					//getRoleById();
 					getRoleData();
 					getRoleForSelect();
 				} else messageApi.error(res.msg || '保存失败');
@@ -435,7 +445,7 @@ export default function UserRolePage() {
 												type="text"
 												icon={<UserOutlined style={{ color: '#faad14' }} />}
 												onClick={() => {
-													setCurrentUser(r);  // 必须先赋值当前用户
+													setCurrentUser(r);
 													handleResetPassword();
 												}}
 											>
@@ -501,8 +511,10 @@ export default function UserRolePage() {
 												description={
 													<Space direction="vertical" size={2}>
 														<Text type="secondary">权限：{r.roleKey}</Text>
-														<Text type="secondary">状态：{r.status == 1 ? '正常' : '停用'}</Text>
-														{r.admin && <Tag color="red">超级管理员</Tag>}
+														<Text type="secondary">等级：{r.roleLevel || '-'}</Text>
+														{/*<Text type="secondary">排序：{r.roleSort || '-'}</Text>
+														<Text type="secondary">状态：{r.status == 1 ? '正常' : '停用'}</Text>*/}
+														{r.roleKey == "admin1" && <Tag color="red">超级管理员</Tag>}
 													</Space>
 												}
 											/>
@@ -552,25 +564,20 @@ export default function UserRolePage() {
 					<Row gutter={16}>
 						<Col span={12}>
 							<Form.Item name="roleSort" label="排序">
-								<InputNumber style={{ width: '100%' }} />
+								<InputNumber style={{ width: '100%' }} min={1} max={100} />
 							</Form.Item>
 						</Col>
 						<Col span={12}>
-							<Form.Item name="status" label="状态" valuePropName="checked">
-								<Switch checkedChildren="正常" unCheckedChildren="停用" />
+							<Form.Item
+								name="roleLevel"
+								label="角色等级"
+								rules={[{ required: true, message: '请输入角色等级' }]}
+							>
+								<InputNumber style={{ width: '100%' }} placeholder="1~100" min={1} max={100} />
 							</Form.Item>
 						</Col>
 					</Row>
 
-					<Row gutter={16}>
-						<Col span={12}>
-							<Form.Item name="siteAccess" label="是否有场站权限" valuePropName="checked">
-								<Switch checkedChildren="是" unCheckedChildren="否" />
-							</Form.Item>
-						</Col>
-						<Col span={12}></Col>
-					</Row>
-
 					{userInfo?.roleId == 23 && (
 						<>
 							<Divider>菜单权限</Divider>
@@ -613,9 +620,6 @@ export default function UserRolePage() {
 								/>
 							</Form.Item>
 						</Col>
-
-
-
 						<Col span={12}>
 							<Form.Item name="language" label="语言">
 								<Select>