From ddbf5ba78e0c09a466d1a4deec1afac204a54cb6 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Wed, 27 Mar 2024 15:52:56 +0800 Subject: [PATCH] check null for orgShortName --- src/pages/Organization/DetailPage/OrganizationCard.js | 2 +- src/pages/Organization/DetailPage/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index e951994..8bc742a 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -112,7 +112,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { validationSchema: yup.object().shape({ enCompanyName: yup.string().max(255, getMaxErrStr(255)).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))), chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))).nullable(), - orgShortName: yup.string().max(24,getMaxErrStr(24)).required(getRequiredErrStr("Please enter ORG Short Name")), + orgShortName: yup.string().max(24, getMaxErrStr(24)).required(getRequiredErrStr("Please enter ORG Short Name")), addressLine1: yup.string().max(40, getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))), addressLine2: yup.string().max(40, getMaxErrStr(40)), addressLine3: yup.string().max(40, getMaxErrStr(40)), diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js index abebc96..d67e5aa 100644 --- a/src/pages/Organization/DetailPage/index.js +++ b/src/pages/Organization/DetailPage/index.js @@ -85,6 +85,7 @@ const OrganizationDetailPage = () => { response.data["fax_countryCode"] = response.data.faxNo?.countryCode; response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateValue(response.data.brExpiryDate) : ""; + response.data["orgShortName"] = response.data.orgShortName !=null ? response.data.orgShortName : ""; setFormData(response.data) setList(response.historyList) }