From f1120fc9928b57417c1f9d919c7b5538b8af3651 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Wed, 9 Apr 2025 09:09:02 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=AB=E0=B8=A7=E0=B8=B1=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrganizationDotnetController.ts           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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,