This commit is contained in:
mamoss 2025-05-13 16:52:14 +07:00
parent 79712aa7bf
commit ba9937510c
6 changed files with 144 additions and 118 deletions

View file

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