diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index c03046f7..06adcb71 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -555,17 +555,17 @@ export class OrganizationDotnetController extends Controller { registrationProvinceId: profile.registrationProvinceId, registrationDistrictId: profile.registrationDistrictId, registrationSubDistrictId: profile.registrationSubDistrictId, - registrationProvince: profile.registrationProvince.name, - registrationDistrict: profile.registrationDistrict.name, - registrationSubDistrict: profile.registrationSubDistrict.name, + registrationProvince: profile.registrationProvince?.name ?? null, + registrationDistrict: profile.registrationDistrict?.name ?? null, + registrationSubDistrict: profile.registrationSubDistrict?.name ?? null, registrationZipCode: profile.registrationZipCode, currentAddress: profile.currentAddress, currentProvinceId: profile.currentProvinceId, currentDistrictId: profile.currentDistrictId, currentSubDistrictId: profile.currentSubDistrictId, - currentProvince: profile.currentProvince.name, - currentDistrict: profile.currentDistrict.name, - currentSubDistrict: profile.currentSubDistrict.name, + currentProvince: profile.currentProvince?.name ?? null, + currentDistrict: profile.currentDistrict?.name ?? null, + currentSubDistrict: profile.currentSubDistrict?.name ?? null, currentZipCode: profile.currentZipCode, dutyTimeId: profile.dutyTimeId, dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate, @@ -874,17 +874,17 @@ export class OrganizationDotnetController extends Controller { registrationProvinceId: profile.registrationProvinceId, registrationDistrictId: profile.registrationDistrictId, registrationSubDistrictId: profile.registrationSubDistrictId, - registrationProvince: profile.registrationProvince.name, - registrationDistrict: profile.registrationDistrict.name, - registrationSubDistrict: profile.registrationSubDistrict.name, + registrationProvince: profile.registrationProvince?.name ?? null, + registrationDistrict: profile.registrationDistrict?.name ?? null, + registrationSubDistrict: profile.registrationSubDistrict?.name ?? null, registrationZipCode: profile.registrationZipCode, currentAddress: profile.currentAddress, currentProvinceId: profile.currentProvinceId, currentDistrictId: profile.currentDistrictId, currentSubDistrictId: profile.currentSubDistrictId, - currentProvince: profile.currentProvince.name, - currentDistrict: profile.currentDistrict.name, - currentSubDistrict: profile.currentSubDistrict.name, + currentProvince: profile.currentProvince?.name ?? null, + currentDistrict: profile.currentDistrict?.name ?? null, + currentSubDistrict: profile.currentSubDistrict?.name ?? null, currentZipCode: profile.currentZipCode, dutyTimeId: profile.dutyTimeId, dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,