From a0486a10b9e919a91d7d4133adcd50ab78609b8e Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 13 Mar 2024 11:22:46 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=84?=
 =?UTF-8?q?=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2=E0=B8=95=E0=B8=B3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/EmployeePositionController.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts
index 4d14762c..8077b2eb 100644
--- a/src/controllers/EmployeePositionController.ts
+++ b/src/controllers/EmployeePositionController.ts
@@ -253,11 +253,21 @@ export class EmployeePositionController extends Controller {
     }
     const mapDataEmpPosDict = await Promise.all(
       findData.map(async (item: any) => {
+        let posTypeName = null;
+        let posLevelName = null;
+        
+        if (item.employeePosType !== null && item.employeePosType !== undefined) {
+          posTypeName = item.employeePosType.posTypeName;
+        }
+        if (item.employeePosLevel !== null && item.employeePosLevel !== undefined) {
+          posLevelName = item.employeePosLevel.posLevelName;
+        }
+
         return {
           id: item.id,
           posDictName: item.posDictName,
-          posTypeName: item.posType == null ? null : item.posType.posTypeName,
-          posLevelName: item.posLevel == null ? null : item.posLevel.posLevelName,
+          posTypeName: posTypeName,
+          posLevelName: posLevelName,
         };
       }),
     );