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

sort

Browse source
This commit is contained in:
mamoss 2025-05-13 17:03:09 +07:00
parent 07f3801084
commit 2466525e8e
3 changed files with 10 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/EmployeePositionController.ts
View file

@ -1174,9 +1174,7 @@ export class EmployeePositionController extends Controller {
.andWhere(revisionCondition);
}),
)
.addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")

4
src/controllers/EmployeeTempPositionController.ts
View file

@ -943,9 +943,7 @@ export class EmployeeTempPositionController extends Controller {
.andWhere(revisionCondition);
}),
)
.addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")

32
src/controllers/PositionController.ts
View file

@ -1796,9 +1796,7 @@ export class PositionController extends Controller {
.andWhere(revisionCondition);
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -2233,9 +2231,7 @@ export class PositionController extends Controller {
.andWhere(revisionCondition);
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -3715,9 +3711,7 @@ export class PositionController extends Controller {
});
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -3985,9 +3979,7 @@ export class PositionController extends Controller {
});
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -4221,9 +4213,7 @@ export class PositionController extends Controller {
});
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -4430,9 +4420,7 @@ export class PositionController extends Controller {
qb.orWhere(typeCondition);
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -4774,9 +4762,7 @@ export class PositionController extends Controller {
qb.andWhere(conditionGroup);
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")
@ -5061,9 +5047,7 @@ export class PositionController extends Controller {
.andWhere({ current_holderId: IsNull() });
}),
)
.addSelect("CASE WHEN posMaster.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
.orderBy("sort_order", "ASC")
.addOrderBy("orgRoot.orgRootOrder", "ASC")
.orderBy("orgRoot.orgRootOrder", "ASC")
.addOrderBy("orgChild1.orgChild1Order", "ASC")
.addOrderBy("orgChild2.orgChild2Order", "ASC")
.addOrderBy("orgChild3.orgChild3Order", "ASC")