From faa4bc9c4dcd208aaa0891e0c561657adfb9755e Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 8 Apr 2025 11:16:04 +0700
Subject: [PATCH 1/2] fix \n

---
 src/controllers/ProfileController.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 7e5420a6..f8e8bbf2 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -7191,7 +7191,7 @@ export class ProfileController extends Controller {
         : posMaster_.orgChild1.orgChild1Name,
       posMaster_ == null || posMaster_.orgRoot == null ? null : posMaster_.orgRoot.orgRootName,
     ];
-    const org = fullNameParts.filter((part) => part !== undefined && part !== null).join(" ");
+    const org = fullNameParts.filter((part) => part !== undefined && part !== null).join("\n");
 
     //find commander(ผู้บังคับบัญชา)
     let node = 4;

From bdaf8fbce9ae0c0548099253bc6e4b8852556951 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 8 Apr 2025 12:10:04 +0700
Subject: [PATCH 2/2] =?UTF-8?q?fix=20eva=20=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ProfileSalaryController.ts | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts
index cc30a765..1b2c3e12 100644
--- a/src/controllers/ProfileSalaryController.ts
+++ b/src/controllers/ProfileSalaryController.ts
@@ -232,7 +232,26 @@ export class ProfileSalaryController extends Controller {
       throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
     }
     const record = await this.salaryRepo.find({
-      where: { profileId: profile.id, commandCode: In(["5", "6", "7"]) },
+      where: { 
+        profileId: profile.id, 
+        // commandCode: In(["5", "6", "7"]) 
+        commandCode: In([
+          "0",
+          "9",
+          "1",
+          "2",
+          "3",
+          "4",
+          "8",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15",
+          "16",
+        ]), 
+      },
       order: { order: "ASC" },
     });
     return new HttpSuccess(record);