diff --git a/src/pages/Announcement/Search/DataGrid.js b/src/pages/Announcement/Search/DataGrid.js
index d9c0738..bf85fa1 100644
--- a/src/pages/Announcement/Search/DataGrid.js
+++ b/src/pages/Announcement/Search/DataGrid.js
@@ -7,15 +7,16 @@ import * as DateUtils from "utils/DateUtils";
 import { useNavigate } from "react-router-dom";
 import { FiDataGrid } from "components/FiDataGrid";
 import { clickableLink } from 'utils/CommonFunction';
+import {GET_ANNOUNCE_LIST} from "utils/ApiPathConst";
 // ==============================|| EVENT TABLE ||============================== //
 
-export default function SearchPublicNoticeTable({ recordList }) {
-    const [rows, setRows] = React.useState(recordList);
+export default function SearchPublicNoticeTable({ searchCriteria }) {
+    const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria);
     const navigate = useNavigate()
 
     React.useEffect(() => {
-        setRows(recordList);   
-    }, [recordList]);
+        set_searchCriteria(searchCriteria);
+    }, [searchCriteria]);
 
     const columns = [
         {
@@ -67,11 +68,14 @@ export default function SearchPublicNoticeTable({ recordList }) {
     return (
         <div style={{ width: '100%' }}>
             <FiDataGrid
-                rows={rows}
                 columns={columns}
                 customPageSize={10}
                 getRowHeight={() => 'auto'}
                 onRowDoubleClick={handleRowDoubleClick}
+                doLoad={{
+                    url: GET_ANNOUNCE_LIST,
+                    params: _searchCriteria,
+                }}
             />
         </div>
     );
diff --git a/src/pages/Announcement/Search/index.js b/src/pages/Announcement/Search/index.js
index 76d6418..91b6aae 100644
--- a/src/pages/Announcement/Search/index.js
+++ b/src/pages/Announcement/Search/index.js
@@ -5,9 +5,7 @@ import {
     Stack
 } from '@mui/material';
 import MainCard from "components/MainCard";
-import * as UrlUtils from "utils/ApiPathConst";
 import * as React from "react";
-import * as HttpUtils from "utils/HttpUtils";
 import * as DateUtils from "utils/DateUtils";
 
 import Loadable from 'components/Loadable';
@@ -30,35 +28,16 @@ const BackgroundHead = {
 
 const UserSearchPage_Individual = () => {
 
-    const [record, setRecord] = React.useState([]);
     const [searchCriteria, setSearchCriteria] = React.useState({
         dateTo: DateUtils.dateValue(new Date()),
         dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 90)),
     });
     const [onReady, setOnReady] = React.useState(false);
 
-    React.useEffect(() => {
-        getDataList();
-    }, []);
-
     React.useEffect(() => {
         setOnReady(true);
-    }, [record]);
-
-    React.useEffect(() => {
-        getDataList();
     }, [searchCriteria]);
 
-    function getDataList() {
-        HttpUtils.get({
-            url: UrlUtils.GET_ANNOUNCE_LIST,
-            params: searchCriteria,
-            onSuccess: function (responseData) {
-                setRecord(responseData);
-            }
-        });
-    }
-
     function applySearch(input) {
         setSearchCriteria(input);
     }
@@ -94,7 +73,7 @@ const UserSearchPage_Individual = () => {
                         sx={{ backgroundColor: '#fff' }}
                     >
                         <EventTable
-                            recordList={record}
+                        searchCriteria={searchCriteria}
                         />
                     </MainCard>
                 </Grid>
diff --git a/src/pages/Organization/SearchPage/OrganizationTable.js b/src/pages/Organization/SearchPage/OrganizationTable.js
index 6e317ff..b7e01da 100644
--- a/src/pages/Organization/SearchPage/OrganizationTable.js
+++ b/src/pages/Organization/SearchPage/OrganizationTable.js
@@ -5,7 +5,6 @@ import {
 } from "@mui/x-data-grid";
 import { FiDataGrid } from "components/FiDataGrid";
 import EditIcon from '@mui/icons-material/Visibility';
-import { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import * as DateUtils from "utils/DateUtils";
 import {GET_ORG_PATH} from "utils/ApiPathConst";
@@ -15,7 +14,7 @@ export default function OrganizationTable({ searchCriteria }) {
     const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria);
     const navigate = useNavigate()
 
-    useEffect(() => {
+    React.useEffect(() => {
         set_searchCriteria(searchCriteria);
     }, [searchCriteria]);