From 3e278b173cebcc670446916bceaee6eb34b54f5e Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 13 Mar 2024 12:06:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=8A=E0=B8=B1=E0=B9=89?=
 =?UTF-8?q?=E0=B8=99=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=95=E0=B8=B2=E0=B8=A1?=
 =?UTF-8?q?=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/EmployeePosLevelController.ts | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/controllers/EmployeePosLevelController.ts b/src/controllers/EmployeePosLevelController.ts
index 8f6a654f..9351c0c8 100644
--- a/src/controllers/EmployeePosLevelController.ts
+++ b/src/controllers/EmployeePosLevelController.ts
@@ -163,14 +163,20 @@ export class EmployeePosLevelController extends Controller {
   @Get("{id}")
   async GetEmpLevelById(@Path() id: string) {
     const getEmpPosLevel = await this.employeePosLevelRepository.findOne({
+      relations: ["employeePosType"],
       select: ["id", "posLevelName", "posLevelRank",],
       where: { id: id },
     });
     if (!getEmpPosLevel) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลระดับชั้นงานลูกจ้างประจำนี้");
     }
-
-    return new HttpSuccess(getEmpPosLevel);
+    const mapEmpPosLevel = {
+      id: getEmpPosLevel.id,
+      posLevelName: getEmpPosLevel.posLevelName,
+      posTypeName: getEmpPosLevel.employeePosType == null ? null : getEmpPosLevel.employeePosType.posTypeName, //กลุ่มงาน
+      commander: null //ผู้มีอำนาจสั่งบรรจุ
+    }
+    return new HttpSuccess(mapEmpPosLevel);
   }
 
   /**
@@ -182,9 +188,15 @@ export class EmployeePosLevelController extends Controller {
   @Get()
   async GetEmpPosLevel() {
     const empPosLevel = await this.employeePosLevelRepository.find({
+      relations: ["employeePosType"],
       select: ["id","posLevelName", "posLevelRank",],
     });
-
-    return new HttpSuccess(empPosLevel);
+    const mapEmpPosLevel = empPosLevel.map((item) => ({
+      id: item.id,
+      posLevelName: item.posLevelName,
+      posTypeName: item.employeePosType == null ? null : item.employeePosType.posTypeName, //กลุ่มงาน
+      commander: null //ผู้มีอำนาจสั่งบรรจุ
+    }));
+    return new HttpSuccess(mapEmpPosLevel);
   }
 }
\ No newline at end of file