diff --git a/src/pages/Container/Supervision/Supervision/User/Add/index.js b/src/pages/Container/Supervision/Supervision/User/Add/index.js index f4bc839..5833e58 100644 --- a/src/pages/Container/Supervision/Supervision/User/Add/index.js +++ b/src/pages/Container/Supervision/Supervision/User/Add/index.js @@ -279,7 +279,7 @@ function Add(props) { items: rolesData, itemsField: { labelKey: "roleName", - valueKey: "id", + valueKey: "roleId", }, }, { diff --git a/src/pages/Container/Supervision/Supervision/User/List/index.js b/src/pages/Container/Supervision/Supervision/User/List/index.js index eda0252..6dab01b 100644 --- a/src/pages/Container/Supervision/Supervision/User/List/index.js +++ b/src/pages/Container/Supervision/Supervision/User/List/index.js @@ -47,7 +47,7 @@ function List(props) { }); useEffect(() => { const fetchPostData = async () => { - props["rolesAll"]({ pageIndex: 1, pageSize: 1000 }).then((res) => { + props["roleUnitAll"]().then((res) => { setRolesData(res.data); }); }; @@ -154,7 +154,7 @@ function List(props) { items: rolesData, itemsField: { labelKey: "roleName", - valueKey: "id", + valueKey: "roleId", }, }, { @@ -267,7 +267,7 @@ function List(props) { { getLabelName({ status: record.roleId, list: rolesData, - idKey: "id", + idKey: "roleId", nameKey: "roleName", })}