hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix sort org

Browse source
This commit is contained in:
Warunee Tamkoo 2025-10-03 17:30:08 +07:00
parent decb2433de
commit 3fe1156155
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -6420,7 +6420,7 @@ export class ProfileController extends Controller {
@Query() nodeId?: string, @Query() nodeId?: string,
@Query() isAll?: boolean, @Query() isAll?: boolean,
@Query() retireType?: string, @Query() retireType?: string,
@Query() sortBy: string = "current_holders.posMasterNo", @Query() sortBy?: string,
@Query() sort: "ASC" | "DESC" = "ASC", @Query() sort: "ASC" | "DESC" = "ASC",
) { ) {
let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER"); let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER");
@ -6587,7 +6587,7 @@ export class ProfileController extends Controller {
}), }),
) )
.addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order") .addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy(`${sortBy ? sortBy : "sort_order"}`, `${sort}`) .orderBy("sort_order", sort)
.addOrderBy("orgRoot.orgRootOrder", sort) .addOrderBy("orgRoot.orgRootOrder", sort)
.addOrderBy("orgChild1.orgChild1Order", sort) .addOrderBy("orgChild1.orgChild1Order", sort)
.addOrderBy("orgChild2.orgChild2Order", sort) .addOrderBy("orgChild2.orgChild2Order", sort)

2
src/controllers/ProfileEmployeeController.ts
View file

@ -2915,7 +2915,7 @@ export class ProfileEmployeeController extends Controller {
nodeId: nodeId, nodeId: nodeId,
}) })
.addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order") .addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy(`${sortBy ? sortBy : "sort_order"}`, `${sort}`) .orderBy("sort_order", sort)
.addOrderBy("orgRoot.orgRootOrder", sort) .addOrderBy("orgRoot.orgRootOrder", sort)
.addOrderBy("orgChild1.orgChild1Order", sort) .addOrderBy("orgChild1.orgChild1Order", sort)
.addOrderBy("orgChild2.orgChild2Order", sort) .addOrderBy("orgChild2.orgChild2Order", sort)