From a3e7ec2c2df3b06ab7444a9e865daf90acefebf9 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Wed, 27 Sep 2023 15:00:47 +0800 Subject: [PATCH] fix companyname when no orgId --- src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js | 1 + src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js b/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js index 55364df..1c83549 100644 --- a/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNoticeDetail_GLD/ApplicationDetailCard.js @@ -209,6 +209,7 @@ const ApplicationDetailCard = ( sx={{ textTransform: 'capitalize', alignItems: 'end', + display: 'none' }}> Edit diff --git a/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js b/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js index 1fc3c93..518fa94 100644 --- a/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js +++ b/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js @@ -48,6 +48,12 @@ const ClientDetailCard = ( setCurrentApplicationDetailData(applicationDetailData.userData); if (!applicationDetailData.companyName1==null){ setCompanyName(applicationDetailData.companyName); + }else{ + const companyNameData ={ + enCompanyName:applicationDetailData.userData.enCompanyName, + chCompanyName:applicationDetailData.userData.chCompanyName + } + setCompanyName(companyNameData) } } }, [applicationDetailData]);