From 6e5b3a927bd0f660bfda84b98676e81a42b0a303 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Sat, 29 Mar 2025 16:59:59 +0700
Subject: [PATCH] sort salary admin

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

diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts
index c89d7a7f..1d94e994 100644
--- a/src/controllers/ProfileSalaryController.ts
+++ b/src/controllers/ProfileSalaryController.ts
@@ -565,7 +565,28 @@ export class ProfileSalaryController extends Controller {
     let _workflow = await new permission().Workflow(req, profileId, "SYS_SALARY_OFFICER");
     if (_workflow == false) await new permission().PermissionGet(req, "SYS_SALARY_OFFICER");
     const record = await this.salaryRepo.find({
-      where: { profileId: profileId },
+      where: [
+        {
+          profileId: profileId,
+          commandCode: In([
+            "0",
+            "9",
+            "1",
+            "2",
+            "3",
+            "4",
+            "8",
+            "10",
+            "11",
+            "12",
+            "13",
+            "14",
+            "15",
+            "16",
+          ]),
+        },
+        { profileId: profileId, commandCode: IsNull() },
+      ],
       order: { order: "ASC" },
     });
     return new HttpSuccess(record);