From 62def572de360a598bf76353171392de43edc65d Mon Sep 17 00:00:00 2001
From: Kanjana <kanjana@chamomind.com>
Date: Fri, 11 Apr 2025 12:06:11 +0700
Subject: [PATCH] Pull data with  CustomerBranch

---
 src/controllers/06-request-list-controller.ts | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts
index 9df79b3..1a0c7c6 100644
--- a/src/controllers/06-request-list-controller.ts
+++ b/src/controllers/06-request-list-controller.ts
@@ -187,14 +187,18 @@ export class RequestDataController extends Controller {
               employeePassport: {
                 orderBy: { expireDate: "desc" },
               },
-              province: {
+              customerBranch: {
                 include: {
-                  employmentOffice: true,
-                },
-              },
-              district: {
-                include: {
-                  employmentOffice: true,
+                  province: {
+                    include: {
+                      employmentOffice: true,
+                    },
+                  },
+                  district: {
+                    include: {
+                      employmentOffice: true,
+                    },
+                  },
                 },
               },
             },
@@ -210,9 +214,8 @@ export class RequestDataController extends Controller {
     const dataRequestData = result.map((item) => {
       const employee = item.employee;
       const dataOffice =
-        item.employee.provinceId === "10"
-          ? employee.district?.employmentOffice
-          : employee.province?.employmentOffice;
+        employee.customerBranch.district?.employmentOffice.at(0) ??
+        employee.customerBranch.province?.employmentOffice.at(0);
 
       return {
         ...item,