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();