Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/site-visit/service.ts b/lib/site-visit/service.ts
index 684e73f1..54f2bf54 100644
--- a/lib/site-visit/service.ts
+++ b/lib/site-visit/service.ts
@@ -593,6 +593,7 @@ export async function getSiteVisitRequestAction(investigationId: number) {
           vendorName: vendors.vendorName,

           vendorCode: vendors.vendorCode,

           vendorEmail: vendors.email,

+          vendorCountry: vendors.country,

         })

         .from(siteVisitRequests)

         .leftJoin(

@@ -658,7 +659,9 @@ export async function getSiteVisitRequestAction(investigationId: number) {
             ...item,

             shiAttendees: item.shiAttendees as Record<string, unknown> | null,

             vendorRequests: item.vendorRequests as Record<string, unknown> | null,

-            vendorInfo,

+            vendorInfo: vendorInfo

+              ? { ...vendorInfo, country: (item as any).vendorCountry || "" }

+              : null,

             shiAttachments,

           };

         })