diff --git a/src/pages/system/administrator/index.tsx b/src/pages/system/administrator/index.tsx index 8573056..842b5b1 100644 --- a/src/pages/system/administrator/index.tsx +++ b/src/pages/system/administrator/index.tsx @@ -28,6 +28,8 @@ const SystemAdministratorPage = () => { const [page, setPage] = useState(1); const [size, setSize] = useState(10); const [list, setList] = useState([]); + const [roles, setRoles] = useState([]); + const [userRoleIds, setUserRoleIds] = useState({}); const [total, setTotal] = useState(0); const [refresh, setRefresh] = useState(false); const [createVisible, setCreateVisible] = useState(false); @@ -48,8 +50,21 @@ const SystemAdministratorPage = () => { }, { title: "角色", - dataIndex: "name", - render: (text: string) => {text}, + dataIndex: "id", + render: (id: number) => ( +
+ {userRoleIds[id] && + userRoleIds[id].map((item: any, index: number) => { + return ( + + {index === userRoleIds[id].length - 1 + ? roles[item][0].name + : roles[item][0].name + "、"} + + ); + })} +
+ ), }, { title: "登录邮箱", @@ -113,6 +128,8 @@ const SystemAdministratorPage = () => { setLoading(true); adminUser.adminUserList(page, size, name, role_ids[0]).then((res: any) => { setList(res.data.data); + setRoles(res.data.roles); + setUserRoleIds(res.data.user_role_ids); setTotal(res.data.total); setLoading(false); }); diff --git a/src/pages/system/adminroles/compenents/update.tsx b/src/pages/system/adminroles/compenents/update.tsx index aa3059b..9486fd6 100644 --- a/src/pages/system/adminroles/compenents/update.tsx +++ b/src/pages/system/adminroles/compenents/update.tsx @@ -24,7 +24,7 @@ export const SystemAdminrolesUpdate: React.FC = ({ }, []); useEffect(() => { - if (id === 0) { + if (id === 0 || "undefined" || "") { return; } getDetail();