fix sort registry and add script update retire emp / position select

2025-10-03 17:04:05 +07:00 · 2025-10-03 17:04:05 +07:00 · aadcec440e
commit aadcec440e
parent ba9fea8403
2 changed files with 179 additions and 13 deletions
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@ -6587,7 +6587,7 @@ export class ProfileController extends Controller {
        }),
      )
      .addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
-      .orderBy("sort_order", "ASC")
+      .orderBy(`${sortBy ? sortBy : "sort_order"}`, `${sort}`)
      .addOrderBy("orgRoot.orgRootOrder", sort)
      .addOrderBy("orgChild1.orgChild1Order", sort)
      .addOrderBy("orgChild2.orgChild2Order", sort)