From a7ada567454c3097345b44555008cc70d7990051 Mon Sep 17 00:00:00 2001 From: Adisak Date: Mon, 29 Sep 2025 14:15:49 +0700 Subject: [PATCH] fix --- src/controllers/ProfileSalaryTempController.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts index 3583d09b..b160f98d 100644 --- a/src/controllers/ProfileSalaryTempController.ts +++ b/src/controllers/ProfileSalaryTempController.ts @@ -342,10 +342,12 @@ export class ProfileSalaryTempController extends Controller { descending ? "DESC" : "ASC" ); }else if(sortBy == "posNo"){ - query = query.orderBy( - `orgRoot.orgRootShortName`, - descending ? "DESC" : "ASC" - ); + query = query.orderBy("orgChild4.orgChild4ShortName",descending ? "DESC" : "ASC") + .addOrderBy("orgChild3.orgChild3ShortName",descending ? "DESC" : "ASC") + .addOrderBy("orgChild2.orgChild2ShortName",descending ? "DESC" : "ASC") + .addOrderBy("orgChild1.orgChild1ShortName",descending ? "DESC" : "ASC") + .addOrderBy("orgRoot.orgRootShortName",descending ? "DESC" : "ASC") + .addOrderBy("current_holders.posMasterNo",descending ? "DESC" : "ASC") }else{ query = query.orderBy( `profile.${sortBy}`,