Merge branch 'develop' into adiDev

This commit is contained in:
AdisakKanthawilang 2024-05-15 13:39:14 +07:00
commit 298d92666a

View file

@ -606,6 +606,7 @@ export class OrganizationController extends Controller {
"orgRoot.orgRevisionId",
"orgRoot.orgRootRank",
"orgRoot.orgRootRankSub",
"orgRoot.responsibility",
])
.orderBy("orgRoot.orgRootOrder", "ASC")
.getMany();
@ -628,6 +629,7 @@ export class OrganizationController extends Controller {
"orgChild1.orgRootId",
"orgChild1.orgChild1Rank",
"orgChild1.orgChild1RankSub",
"orgChild1.responsibility",
])
.orderBy("orgChild1.orgChild1Order", "ASC")
.getMany()
@ -652,6 +654,7 @@ export class OrganizationController extends Controller {
"orgChild2.orgChild2Rank",
"orgChild2.orgChild2RankSub",
"orgChild2.orgChild1Id",
"orgChild2.responsibility",
])
.orderBy("orgChild2.orgChild2Order", "ASC")
.getMany()
@ -676,6 +679,7 @@ export class OrganizationController extends Controller {
"orgChild3.orgChild3Rank",
"orgChild3.orgChild3RankSub",
"orgChild3.orgChild2Id",
"orgChild3.responsibility",
])
.orderBy("orgChild3.orgChild3Order", "ASC")
.getMany()
@ -700,6 +704,7 @@ export class OrganizationController extends Controller {
"orgChild4.orgChild4Rank",
"orgChild4.orgChild4RankSub",
"orgChild4.orgChild3Id",
"orgChild4.responsibility",
])
.orderBy("orgChild4.orgChild4Order", "ASC")
.getMany()