From fbdce54a120d14e743a952301f75d0e03384ce5b Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 19 Feb 2025 17:47:38 +0700
Subject: [PATCH] fix order

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

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index bc63e568..b7e4978d 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -4659,7 +4659,7 @@ export class ProfileController extends Controller {
     @Query() nodeId?: string,
     @Query() isAll?: boolean,
     @Query() retireType?: string,
-    @Query() sortBy: string = "posMasterNo",
+    @Query() sortBy: string = "current_holders.posMasterNo",
     @Query() sort: "ASC"|"DESC" = "ASC",
   ) {
     let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER");
@@ -4817,7 +4817,7 @@ export class ProfileController extends Controller {
         }),
       )
       // .orderBy("current_holders.posMasterNo", "ASC")
-      .orderBy(`current_holders.${sortBy}`, sort)
+      .orderBy(`${sortBy}`, sort)
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index e12101d0..df51bef8 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1704,7 +1704,7 @@ export class ProfileEmployeeController extends Controller {
     @Query() nodeId?: string,
     @Query() isAll?: boolean,
     @Query() retireType?: string,
-    @Query() sortBy: string = "posMasterNo",
+    @Query() sortBy: string = "current_holders.posMasterNo",
     @Query() sort: "ASC"|"DESC" = "ASC",
   ) {
     let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_EMP");
@@ -1863,7 +1863,7 @@ export class ProfileEmployeeController extends Controller {
       //   orgRevisionId: findRevision.id,
       // })
       // .orderBy("current_holders.posMasterNo", "ASC")
-      .orderBy(`current_holders.${sortBy}`, sort)
+      .orderBy(`${sortBy}`, sort)
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();