diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index a4c661d2..071186a3 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -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") diff --git a/src/controllers/EmployeeTempPositionController.ts b/src/controllers/EmployeeTempPositionController.ts index ea8ebefb..a7f875a1 100644 --- a/src/controllers/EmployeeTempPositionController.ts +++ b/src/controllers/EmployeeTempPositionController.ts @@ -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") diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 9a4b4c21..d15450b3 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -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")