From abcc0b9246d64128ac76b8799f96bd28ae5ccdaf Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 27 Mar 2025 14:47:56 +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=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99=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=96=E0=B9=89=E0=B8=B2=E0=B9=84=E0=B8=A1=E0=B9=88?=
 =?UTF-8?q?=E0=B9=84=E0=B8=94=E0=B9=89=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=20filter=20=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=87=E0=B8=88=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99/=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=20(issue=20#113)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ProfileController.ts         | 8 +++++++-
 src/controllers/ProfileEmployeeController.ts | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 0ad007d5..eda3f03e 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -6119,7 +6119,13 @@ export class ProfileController extends Controller {
         }),
       )
       // .orderBy("current_holders.posMasterNo", "ASC")
-      .orderBy(`${sortBy}`, sort)
+      // .orderBy(`${sortBy}`, sort)
+      .orderBy("orgRoot.orgRootOrder", sort)
+      .addOrderBy("orgChild1.orgChild1Order", sort)
+      .addOrderBy("orgChild2.orgChild2Order", sort)
+      .addOrderBy("orgChild3.orgChild3Order", sort)
+      .addOrderBy("orgChild4.orgChild4Order", sort)
+      .addOrderBy("current_holders.posMasterNo", sort)
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 0ffcfd2d..62208219 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -2235,7 +2235,13 @@ export class ProfileEmployeeController extends Controller {
       //   orgRevisionId: findRevision.id,
       // })
       // .orderBy("current_holders.posMasterNo", "ASC")
-      .orderBy(`${sortBy}`, sort)
+      // .orderBy(`${sortBy}`, sort)
+      .orderBy("orgRoot.orgRootOrder", sort)
+      .addOrderBy("orgChild1.orgChild1Order", sort)
+      .addOrderBy("orgChild2.orgChild2Order", sort)
+      .addOrderBy("orgChild3.orgChild3Order", sort)
+      .addOrderBy("orgChild4.orgChild4Order", sort)
+      .addOrderBy("current_holders.posMasterNo", sort)
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();