From 719da258758fcb82dba6796b1262595733196c4e Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 10 Apr 2025 15:04:17 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D=E0=B8=B6=E0=B8=81?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=20&=20=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=8A=E0=B8=B1=E0=B9=89=E0=B8=99?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?=
 =?UTF-8?q?=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/DevelopmentController.ts | 2 +-
 src/controllers/ReportController.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index 95d2ae4..0e8e115 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -2434,7 +2434,7 @@ export class DevelopmentController extends Controller {
             ? item.posLevel.posLevelName
             : null
           : item.employeePosLevel
-            ? item.employeePosLevel.posLevelName
+            ? `${item.employeePosType.posTypeShortName ?? ""} ${item.employeePosLevel.posLevelName ?? ""}`
             : null,
       posExecutive: item.posExecutive,
       org: item.org,
diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index d9ff0eb..3f1183d 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -505,7 +505,7 @@ export class ReportController extends Controller {
       .andWhere(body.year != 0 && body.year != null ? "development.year = :year" : "1=1", {
         year: body.year,
       })
-      .andWhere(body.root != null ? "development.root = :root" : "1=1", {
+      .andWhere(body.root != null ? "developmentHistory.root = :root" : "1=1", {
         root: body.root,
       })
       .andWhere("developmentHistory.type = :type", { type: "EMPLOYEE" })