From 3c3387574875c3e67b0c878e5edf183715bc93f0 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 28 Mar 2025 12:10:12 +0700 Subject: [PATCH] fix --- src/controllers/OrganizationController.ts | 2 +- src/controllers/OrganizationDotnetController.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 5b4849bd..66ee363d 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -7576,7 +7576,7 @@ export class OrganizationController extends Controller { order: { orgRootName: "ASC" }, select: ["orgRootName"], }); - const root = [root1, root2]; + const root = [...root1, ...root2]; const child1 = await this.child1Repository.find({ where: { diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index 3bcb59ef..dabc0921 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -536,17 +536,17 @@ export class OrganizationDotnetController extends Controller { registrationProvinceId: profile.registrationProvinceId, registrationDistrictId: profile.registrationDistrictId, registrationSubDistrictId: profile.registrationSubDistrictId, - registrationProvince: profile.registrationProvince.id, - registrationDistrict: profile.registrationDistrict.id, - registrationSubDistrict: profile.registrationSubDistrict.id, + registrationProvince: profile.registrationProvince.name, + registrationDistrict: profile.registrationDistrict.name, + registrationSubDistrict: profile.registrationSubDistrict.name, registrationZipCode: profile.registrationZipCode, currentAddress: profile.currentAddress, currentProvinceId: profile.currentProvinceId, currentDistrictId: profile.currentDistrictId, currentSubDistrictId: profile.currentSubDistrictId, - currentProvince: profile.currentProvince.id, - currentDistrict: profile.currentDistrict.id, - currentSubDistrict: profile.currentSubDistrict.id, + currentProvince: profile.currentProvince.name, + currentDistrict: profile.currentDistrict.name, + currentSubDistrict: profile.currentSubDistrict.name, currentZipCode: profile.currentZipCode, dutyTimeId: profile.dutyTimeId, dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,