From bf4d551f4086bee470726a7f672f899dd80a8161 Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Fri, 17 Jan 2025 11:10:04 +0700
Subject: [PATCH] query add type RetirementDeceased

---
 src/controllers/ProfileEmployeeController.ts               | 5 ++++-
 src/controllers/ProfileEmployeeTempController.ts           | 5 ++++-
 src/controllers/ProfileGovernmentEmployeeController.ts     | 2 +-
 src/controllers/ProfileGovernmentEmployeeTempController.ts | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index b025054f..b23523a4 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1943,7 +1943,10 @@ export class ProfileEmployeeController extends Controller {
       firstName: _data.firstName,
       lastName: _data.lastName,
       citizenId: _data.citizenId,
-      posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName,
+      posLevel:
+        _data.posLevel == null
+          ? null
+          : `${_data?.posType?.posTypeShortName ?? ""} ${_data?.posLevel?.posLevelName ?? ""}`,
       posType: _data.posType == null ? null : _data.posType.posTypeName,
       position: _data.position,
     }));
diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts
index 377eec05..4d963083 100644
--- a/src/controllers/ProfileEmployeeTempController.ts
+++ b/src/controllers/ProfileEmployeeTempController.ts
@@ -1759,7 +1759,10 @@ export class ProfileEmployeeTempController extends Controller {
       firstName: _data.firstName,
       lastName: _data.lastName,
       citizenId: _data.citizenId,
-      posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName,
+      posLevel:
+        _data.posLevel == null
+          ? null
+          : `${_data?.posType?.posTypeShortName ?? ""} ${_data?.posLevel?.posLevelName ?? ""}`,
       posType: _data.posType == null ? null : _data.posType.posTypeName,
       position: _data.position,
     }));
diff --git a/src/controllers/ProfileGovernmentEmployeeController.ts b/src/controllers/ProfileGovernmentEmployeeController.ts
index 48959a68..626149f0 100644
--- a/src/controllers/ProfileGovernmentEmployeeController.ts
+++ b/src/controllers/ProfileGovernmentEmployeeController.ts
@@ -215,7 +215,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
       posLevel:
         record.posLevel == null
           ? null
-          : `${record.posType.posTypeShortName}${record.posLevel.posLevelName}`, //ระดับ
+          : `${record?.posType?.posTypeShortName ?? ""} ${record?.posLevel?.posLevelName ?? ""}`, //ระดับ
       posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNo}`, //เลขที่ตำแหน่ง
       posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท
       dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate), //วันเกษียณ
diff --git a/src/controllers/ProfileGovernmentEmployeeTempController.ts b/src/controllers/ProfileGovernmentEmployeeTempController.ts
index 4657137c..6facd5b0 100644
--- a/src/controllers/ProfileGovernmentEmployeeTempController.ts
+++ b/src/controllers/ProfileGovernmentEmployeeTempController.ts
@@ -205,7 +205,7 @@ export class ProfileGovernmentEmployeeTempController extends Controller {
       posLevel:
         record.posLevel == null
           ? null
-          : `${record.posType.posTypeShortName}${record.posLevel.posLevelName}`, //ระดับ
+          : `${record?.posType?.posTypeShortName ?? ""} ${record?.posLevel?.posLevelName ?? ""}`, //ระดับ
       posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNo}`, //เลขที่ตำแหน่ง
       posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท
       dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate), //วันเกษียณ