diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index eb91c408..960b4815 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -5807,6 +5807,7 @@ export class OrganizationController extends Controller { .leftJoin("orgRoot.posMasters", "posMasters") .leftJoin("posMasters.current_holder", "current_holder") .orderBy("orgRoot.orgRootOrder", "ASC") + .addOrderBy("posMasters.posMasterOrder", "ASC") .getMany(); const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null; @@ -5847,6 +5848,7 @@ export class OrganizationController extends Controller { .leftJoin("orgChild1.posMasters", "posMasters") .leftJoin("posMasters.current_holder", "current_holder") .orderBy("orgChild1.orgChild1Order", "ASC") + .addOrderBy("posMasters.posMasterOrder", "ASC") .getMany() : []; @@ -5888,6 +5890,7 @@ export class OrganizationController extends Controller { .leftJoin("orgChild2.posMasters", "posMasters") .leftJoin("posMasters.current_holder", "current_holder") .orderBy("orgChild2.orgChild2Order", "ASC") + .addOrderBy("posMasters.posMasterOrder", "ASC") .getMany() : []; @@ -5929,6 +5932,7 @@ export class OrganizationController extends Controller { .leftJoin("orgChild3.posMasters", "posMasters") .leftJoin("posMasters.current_holder", "current_holder") .orderBy("orgChild3.orgChild3Order", "ASC") + .addOrderBy("posMasters.posMasterOrder", "ASC") .getMany() : []; @@ -5965,6 +5969,7 @@ export class OrganizationController extends Controller { .leftJoin("orgChild4.posMasters", "posMasters") .leftJoin("posMasters.current_holder", "current_holder") .orderBy("orgChild4.orgChild4Order", "ASC") + .addOrderBy("posMasters.posMasterOrder", "ASC") .getMany() : [];