From 473d360628e0bbb3f2fa1d6702723d9fb8a0067e Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Wed, 13 Dec 2023 13:06:26 +0800
Subject: [PATCH] fix orgid null

---
 .../PublicNotice/Details_Public/ApplicationDetailCard.js  | 7 +++++--
 src/pages/PublicNotice/ListPanel/BaseGrid.js              | 8 ++++----
 src/pages/PublicNotice/ListPanel/PendingPaymentTab.js     | 8 ++++----
 .../PublicNotice/ListPanel/SearchPublicNoticeTable.js     | 8 ++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index abc1ebc..32808ae 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -27,6 +27,9 @@ import * as HttpUtils from "utils/HttpUtils"
 import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
 import * as DateUtils from "utils/DateUtils";
 import * as FormatUtils from "utils/FormatUtils";
+import {
+    isORGLoggedIn,
+  } from "utils/Utils";
 
 // import BorderColorOutlinedIcon from '@mui/icons-material/BorderColorOutlined';
 // import DoneIcon from '@mui/icons-material/Done';
@@ -513,7 +516,7 @@ const ApplicationDetailCard = (
                                     </Grid>
                                 </Grid>
                             </Grid>
-                            {currentApplicationDetailData.orgId === null ? null:
+                            {isORGLoggedIn() ?
                                 <Grid item xs={12} md={6} lg={6} sx={{ mb: 1, paddingTop: 2 }}>
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
@@ -524,7 +527,7 @@ const ApplicationDetailCard = (
                                             <Typography variant="h5">{currentApplicationDetailData.careOf}</Typography>
                                         </Grid>
                                     </Grid>
-                                </Grid>
+                                </Grid>: null
                             }
                             <Grid item xs={12} md={6} lg={6} sx={{ mb: 1, paddingTop: 2 }}>
                                 <Grid container alignItems={"center"}>
diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js
index 65e36d9..cbb7c36 100644
--- a/src/pages/PublicNotice/ListPanel/BaseGrid.js
+++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js
@@ -70,13 +70,13 @@ export default function BaseGrid({rows}) {
             headerName:  isORGLoggedIn()?"Care Of / 我的備註":"我的備註",
             flex: 3,
             renderCell: (params) => (
-                params.row.orgId === null? 
-                <div>
-                  <Typography>{params.row.remarks}</Typography>
-                </div>:
+                isORGLoggedIn()? 
                 <div>
                   <Typography>Care Of: {params.row.careOf}</Typography>
                   <Typography>我的備註: {params.row.remarks}</Typography>
+                </div>:
+                <div>
+                    <Typography>{params.row.remarks}</Typography>
                 </div>
               )
         },
diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
index b90db3e..eb25df6 100644
--- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
+++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js
@@ -112,13 +112,13 @@ export default function SubmittedTab({ rows }) {
             headerName:  isORGLoggedIn()?"Care Of / 我的備註":"我的備註",
             flex: 3,
             renderCell: (params) => (
-                params.row.orgId === null? 
-                <div>
-                  <Typography>{params.row.remarks}</Typography>
-                </div>:
+                isORGLoggedIn()? 
                 <div>
                   <Typography>Care Of: {params.row.careOf}</Typography>
                   <Typography>我的備註: {params.row.remarks}</Typography>
+                </div>:
+                <div>
+                    <Typography>{params.row.remarks}</Typography>
                 </div>
               )
         },
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
index b36b342..0debc82 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js
@@ -73,13 +73,13 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName:  isORGLoggedIn()?"Care Of / 我的備註":"我的備註",
             flex: 3,
             renderCell: (params) => (
-                params.row.orgId === null? 
-                <div>
-                  <Typography>{params.row.remarks}</Typography>
-                </div>:
+                isORGLoggedIn()? 
                 <div>
                   <Typography>Care Of: {params.row.careOf}</Typography>
                   <Typography>我的備註: {params.row.remarks}</Typography>
+                </div>:
+                <div>
+                     <Typography>{params.row.remarks}</Typography>
                 </div>
               )
         },