From ac41766f436e46e4395b4399a6d051804e38bcb9 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Fri, 26 Jul 2024 18:28:05 +0700
Subject: [PATCH] no message

---
 src/controllers/ImportDataController.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts
index e568d191..3e4f50fb 100644
--- a/src/controllers/ImportDataController.ts
+++ b/src/controllers/ImportDataController.ts
@@ -1001,7 +1001,7 @@ export class ImportDataController extends Controller {
               _item.registrationProvinceId = provinceId ? provinceId.id : null_;
             }
           }
-          if (existingProfile.AMPHUR_CODE) {
+          if (existingProfile.AMPHUR_CODE && provinceRegis_) {
             districtRegis_ = await this.amphurRepo.findOne({
               where: {
                 AMPHUR_CODE: existingProfile.AMPHUR_CODE,
@@ -1017,7 +1017,7 @@ export class ImportDataController extends Controller {
               _item.registrationDistrictId = districtId ? districtId.id : null_;
             }
           }
-          if (existingProfile.DISTRICT_CODE) {
+          if (existingProfile.DISTRICT_CODE && districtRegis_ && provinceRegis_) {
             subDistrictRegis_ = await this.subDistrictRepo.findOne({
               where: {
                 DISTRICT_CODE: existingProfile.DISTRICT_CODE,
@@ -1048,7 +1048,7 @@ export class ImportDataController extends Controller {
               _item.currentProvinceId = provinceId ? provinceId.id : null_;
             }
           }
-          if (existingProfile.CONTACT_AMPHUR_CODE) {
+          if (existingProfile.CONTACT_AMPHUR_CODE && provinceCurr_) {
             districtCurr_ = await this.amphurRepo.findOne({
               where: {
                 AMPHUR_CODE: existingProfile.CONTACT_AMPHUR_CODE,
@@ -1064,7 +1064,7 @@ export class ImportDataController extends Controller {
               _item.currentDistrictId = districtId ? districtId.id : null_;
             }
           }
-          if (existingProfile.CONTACT_DISTRICT_CODE) {
+          if (existingProfile.CONTACT_DISTRICT_CODE && districtCurr_ && provinceCurr_) {
             subDistrictCurr_ = await this.subDistrictRepo.findOne({
               where: {
                 DISTRICT_CODE: existingProfile.CONTACT_DISTRICT_CODE,