diff --git a/src/pages/pnspsUserDetailPage/UserAuthTable.js b/src/pages/pnspsUserDetailPage/UserAuthTable.js
index 8a92d15..af03ded 100644
--- a/src/pages/pnspsUserDetailPage/UserAuthTable.js
+++ b/src/pages/pnspsUserDetailPage/UserAuthTable.js
@@ -15,7 +15,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo
// ==============================|| EVENT TABLE ||============================== //
-export default function UserAuthTable({setSelectedRow, userAuth}) {
+export default function UserAuthTable({setSelectedRow, userAuth,isNewRecord}) {
const [authData, setAuthData] = useState([]);
const [onReady, setOnReady] = useState(false);
const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth);
@@ -35,7 +35,7 @@ export default function UserAuthTable({setSelectedRow, userAuth}) {
useEffect(() => {
//if state data are ready and assign to different field
- if (authData.length > 0) {
+ if (authData.length > 0||isNewRecord) {
setOnReady(true);
}
}, [authData]);
diff --git a/src/pages/pnspsUserDetailPage/UserAuthorityCard.js b/src/pages/pnspsUserDetailPage/UserAuthorityCard.js
index 1f4c76b..8949ef3 100644
--- a/src/pages/pnspsUserDetailPage/UserAuthorityCard.js
+++ b/src/pages/pnspsUserDetailPage/UserAuthorityCard.js
@@ -16,7 +16,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo
// ==============================|| DASHBOARD - DEFAULT ||============================== //
-const UserAuthorityCard = ({isCollectData, updateUserAuthList,userData}) => {
+const UserAuthorityCard = ({isCollectData, updateUserAuthList,userData,isNewRecord}) => {
const [currentAuthData, setCurrentAuthData] = React.useState({});
const [onReady, setOnReady] = useState(false);
const [selectedRow, setSelectedRow] = useState([]);
@@ -57,6 +57,7 @@ const UserAuthorityCard = ({isCollectData, updateUserAuthList,userData}) => {
);
diff --git a/src/pages/pnspsUserGroupDetailPage/GroupAuthCard.js b/src/pages/pnspsUserGroupDetailPage/GroupAuthCard.js
index 4e94f55..e223b0b 100644
--- a/src/pages/pnspsUserGroupDetailPage/GroupAuthCard.js
+++ b/src/pages/pnspsUserGroupDetailPage/GroupAuthCard.js
@@ -15,7 +15,7 @@ const GroupAuthTable = Loadable(lazy(() => import('./GroupAuthTable')));
// ==============================|| DASHBOARD - DEFAULT ||============================== //
-const GroupAuthCard = ({isCollectData, updateUserAuthList,userGroupData}) => {
+const GroupAuthCard = ({isCollectData, updateUserAuthList,userGroupData,isNewRecord}) => {
const [currentAuthData, setCurrentAuthData] = React.useState({});
const [onReady, setOnReady] = useState(false);
const [selectedRow, setSelectedRow] = useState([]);
@@ -62,6 +62,7 @@ const GroupAuthCard = ({isCollectData, updateUserAuthList,userGroupData}) => {
);
diff --git a/src/pages/pnspsUserGroupDetailPage/GroupAuthTable.js b/src/pages/pnspsUserGroupDetailPage/GroupAuthTable.js
index 93c13c0..f4649e6 100644
--- a/src/pages/pnspsUserGroupDetailPage/GroupAuthTable.js
+++ b/src/pages/pnspsUserGroupDetailPage/GroupAuthTable.js
@@ -15,7 +15,7 @@ const LoadingComponent = Loadable(lazy(() => import('../extra-pages/LoadingCompo
// ==============================|| EVENT TABLE ||============================== //
-export default function GroupAuthTable({setSelectedRow, userAuth}) {
+export default function GroupAuthTable({setSelectedRow, userAuth,isNewRecord}) {
const [authData, setAuthData] = useState([]);
const [onReady, setOnReady] = useState(false);
const [currentSelectedRow, setCurrentSelectedRow] = useState(userAuth);
@@ -35,7 +35,7 @@ export default function GroupAuthTable({setSelectedRow, userAuth}) {
useEffect(() => {
//if state data are ready and assign to different field
- if (authData.length > 0) {
+ if (authData.length > 0||isNewRecord) {
setOnReady(true);
}
}, [authData]);
diff --git a/src/pages/pnspsUserGroupDetailPage/UserAddCard.js b/src/pages/pnspsUserGroupDetailPage/UserAddCard.js
index de144dc..78a4c1e 100644
--- a/src/pages/pnspsUserGroupDetailPage/UserAddCard.js
+++ b/src/pages/pnspsUserGroupDetailPage/UserAddCard.js
@@ -7,7 +7,7 @@ import {
import MainCard from "../../components/MainCard";
import * as React from "react";
import {useEffect, useState} from "react";
-import {GET_GROUP_MEMBER_LIST_PATH, GET_USER_COMBO_LIST} from "../../utils/ApiPathConst";
+import {GET_GROUP_MEMBER_LIST_PATH, GET_USER_GLD_COMBO_LIST} from "../../utils/ApiPathConst";
import axios from "axios";
import {apiPath} from "../../auth/utils";
import Autocomplete from "@mui/material/Autocomplete";
@@ -43,7 +43,7 @@ const UserAddCard = ({isCollectData, updateGroupMember,userGroupData,isNewRecord
}
useEffect(() => {
- axios.get(`${apiPath}${GET_USER_COMBO_LIST}`)
+ axios.get(`${apiPath}${GET_USER_GLD_COMBO_LIST}`)
.then((response) => {
if (response.status === 200) {
setUserComboList(response.data.records);
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index aaffdb7..bcee5ac 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -11,6 +11,7 @@ export const GET_GROUP_AUTH_LIST = '/group/auth/combo';
export const GLD_USER_PATH = apiPath+'/user/gld';
export const GET_AUTH_LIST = '/user/auth/combo';
export const GET_USER_COMBO_LIST = '/user/combo';
+export const GET_USER_GLD_COMBO_LIST = '/user/combo/gld';
export const GET_USER_LOCK = apiPath+'/user/lock';
export const GET_USER_UNLOCK = apiPath+'/user/unlock';