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

#2508
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
Details

Browse source
This commit is contained in:
Adisak 2026-05-20 16:27:39 +07:00
parent ddf0309b0b
commit d0c5d90033
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/OrganizationController.ts
View file

@ -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()
: [];