diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index 4fd5900..ce268ba 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -93,6 +93,9 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
         if (customPageSize) {
             setPageSize(customPageSize);
         }
+        if (_doLoad !== undefined && Object.keys(_doLoad).length==0 ){
+            setLoading(false)
+        }
     }, [sx, hideFooterSelectedRowCount, rowModesModel, rows, columns, pageSizeOptions, autoHeight, editMode, filterItems, customPageSize]);
 
     const handleChangePage = (event, newPage) => {
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index 610e1c5..0578bcb 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -14,6 +14,7 @@ import {
 import {GET_PUBLIC_NOTICE_LIST} from "utils/ApiPathConst";
 import { useTheme } from "@emotion/react";
 import { FormattedMessage, useIntl } from "react-intl";
+import * as React from 'react';
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function SearchPublicNoticeTable({ searchCriteria }) {
diff --git a/src/pages/User/SearchPage/UserTable.js b/src/pages/User/SearchPage/UserTable.js
index edff2da..8d58412 100644
--- a/src/pages/User/SearchPage/UserTable.js
+++ b/src/pages/User/SearchPage/UserTable.js
@@ -8,7 +8,7 @@ import * as HttpUtils from 'utils/HttpUtils';
 import { GLD_USER_PATH, GET_USER_LOCK, GET_USER_UNLOCK } from "utils/ApiPathConst";
 import { notifyLockSuccess, notifyUnlockSuccess , clickableLink} from 'utils/CommonFunction';
 import { isGrantedAny } from "auth/utils";
-
+import * as React from 'react';
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function UserTable({searchCriteria}) {
diff --git a/src/pages/User/SearchPage_Individual/UserTable_Individual.js b/src/pages/User/SearchPage_Individual/UserTable_Individual.js
index a727308..74c5053 100644
--- a/src/pages/User/SearchPage_Individual/UserTable_Individual.js
+++ b/src/pages/User/SearchPage_Individual/UserTable_Individual.js
@@ -9,6 +9,7 @@ import { useNavigate } from "react-router-dom";
 import * as DateUtils from "utils/DateUtils";
 import { GET_IND_USER_PATH } from "utils/ApiPathConst";
 import { clickableLink} from 'utils/CommonFunction';
+import * as React from 'react';
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function UserTable_Individual({ searchCriteria }) {
diff --git a/src/pages/User/SearchPage_Organization/UserTable_Organization.js b/src/pages/User/SearchPage_Organization/UserTable_Organization.js
index 94e58bd..c7ff0e6 100644
--- a/src/pages/User/SearchPage_Organization/UserTable_Organization.js
+++ b/src/pages/User/SearchPage_Organization/UserTable_Organization.js
@@ -12,7 +12,7 @@ import CheckCircleOutline from '@mui/icons-material/CheckCircleOutline';
 import * as DateUtils from 'utils/DateUtils';
 import { GET_ORG_USER_PATH } from "utils/ApiPathConst";
 import { clickableLink} from 'utils/CommonFunction';
-
+import * as React from 'react';
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function UserTable_Organization({searchCriteria}) {
diff --git a/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js b/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js
index b1c68c3..a3f322c 100644
--- a/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js
+++ b/src/pages/pnspsUserGroupSearchPage/UserGroupTable.js
@@ -8,6 +8,7 @@ import {useState, useEffect} from "react";
 import {useNavigate} from "react-router-dom";
 import { GET_GROUP_LIST_PATH } from "utils/ApiPathConst";
 import { clickableLink} from 'utils/CommonFunction';
+import * as React from 'react';
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function UserGroupTable({searchCriteria}) {