From d35065b2fb2b3cea92d22b171afc15048a2a6e75 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 14 May 2024 17:39:06 +0800
Subject: [PATCH 1/2] fix bug

---
 src/pages/Setting/SystemSetting/index.js     | 8 +++++++-
 src/pages/User/ManagePage_OrgPublic/index.js | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/Setting/SystemSetting/index.js b/src/pages/Setting/SystemSetting/index.js
index d9c5875..b53ae9b 100644
--- a/src/pages/Setting/SystemSetting/index.js
+++ b/src/pages/Setting/SystemSetting/index.js
@@ -34,6 +34,7 @@ const BackgroundHead = {
 const SystemSetting = () => {
     const [searchCriteria, setSearchCriteria] = React.useState({});
     const [selectedItem, setSelectedItem] = React.useState({});
+    const [reloadTime, setReloadTime] = React.useState(new Date())
 
     React.useEffect(()=>{
         setSearchCriteria({})
@@ -43,6 +44,11 @@ const SystemSetting = () => {
         setSelectedItem(param.row);
     }
 
+    React.useEffect(() => {
+        searchCriteria.reloadTime = reloadTime;
+        setSearchCriteria(searchCriteria);
+    }, [reloadTime]);
+
     const onSave = (param) => {
         HttpUtils.post({
             url: GET_SYS_PARAMS + "/update",
@@ -52,7 +58,7 @@ const SystemSetting = () => {
             },
             onSuccess: () => {
                 notifyActionSuccess();
-                loadList();
+                setReloadTime(new Date());
             }
         });
     }
diff --git a/src/pages/User/ManagePage_OrgPublic/index.js b/src/pages/User/ManagePage_OrgPublic/index.js
index 4a6d6c0..4f91026 100644
--- a/src/pages/User/ManagePage_OrgPublic/index.js
+++ b/src/pages/User/ManagePage_OrgPublic/index.js
@@ -69,7 +69,7 @@ const ManageOrgUserPage = () => {
         HttpUtils.get({
             url: GET_USER_UNLOCK + "/" + params.row.id,
             onSuccess: () => {
-                setReloadTime(new Date);
+                setReloadTime(new Date());
             }
         });
     }
@@ -109,7 +109,7 @@ const ManageOrgUserPage = () => {
             {
                 url: (!selectUser.row.primaryUser ? GET_SET_PRIMARY_USER : GET_SET_UN_PRIMARY_USER) + "/" + selectUser.row.id,
                 onSuccess: function () {
-                    setReloadTime(new Date);
+                    setReloadTime(new Date());
                 }
             }
         );

From 1931bdf7fa2fa9f7711359dfcd8ced246a4059a9 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 14 May 2024 17:47:31 +0800
Subject: [PATCH 2/2] fix bug

---
 src/pages/Setting/SystemSetting/Table.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Setting/SystemSetting/Table.js b/src/pages/Setting/SystemSetting/Table.js
index e198d6f..7e39d35 100644
--- a/src/pages/Setting/SystemSetting/Table.js
+++ b/src/pages/Setting/SystemSetting/Table.js
@@ -67,10 +67,10 @@ const Table = ({onRowClick, searchCriteria}) => {
                         customPageSize={10}
                         getRowHeight={() => 'auto'}
                         onRowClick={onRowClick}
-                        doLoad={{
+                        doLoad={React.useMemo(() => ({
                             url:GET_SYS_PARAMS,
                             params:_searchCriteria
-                        }}
+                        }), [_searchCriteria])}
                     />
                 </Box>
             </div>