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

#1767 (#205)
Some checks failed
release / release (push) Failing after 9s
Details

Browse source
This commit is contained in:
AdisakKanthawilang 2025-11-03 11:56:26 +07:00 • committed by GitHub
parent f32debfbb6
commit 39a1a3bbb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/controllers/OrganizationController.ts
View file

@ -1218,6 +1218,7 @@ export class OrganizationController extends Controller {
"orgRoot.SECTION_CODE", "orgRoot.SECTION_CODE",
"orgRoot.JOB_CODE", "orgRoot.JOB_CODE",
"orgRoot.responsibility", "orgRoot.responsibility",
"orgRoot.ancestorDNA",
]) ])
.orderBy("orgRoot.orgRootOrder", "ASC") .orderBy("orgRoot.orgRootOrder", "ASC")
.getMany(); .getMany();
@ -1246,6 +1247,7 @@ export class OrganizationController extends Controller {
"orgChild1.SECTION_CODE", "orgChild1.SECTION_CODE",
"orgChild1.JOB_CODE", "orgChild1.JOB_CODE",
"orgChild1.responsibility", "orgChild1.responsibility",
"orgChild1.ancestorDNA",
]) ])
.orderBy("orgChild1.orgChild1Order", "ASC") .orderBy("orgChild1.orgChild1Order", "ASC")
.getMany() .getMany()
@ -1275,6 +1277,7 @@ export class OrganizationController extends Controller {
"orgChild2.JOB_CODE", "orgChild2.JOB_CODE",
"orgChild2.orgChild1Id", "orgChild2.orgChild1Id",
"orgChild2.responsibility", "orgChild2.responsibility",
"orgChild2.ancestorDNA",
]) ])
.orderBy("orgChild2.orgChild2Order", "ASC") .orderBy("orgChild2.orgChild2Order", "ASC")
.getMany() .getMany()
@ -1304,6 +1307,7 @@ export class OrganizationController extends Controller {
"orgChild3.JOB_CODE", "orgChild3.JOB_CODE",
"orgChild3.orgChild2Id", "orgChild3.orgChild2Id",
"orgChild3.responsibility", "orgChild3.responsibility",
"orgChild3.ancestorDNA",
]) ])
.orderBy("orgChild3.orgChild3Order", "ASC") .orderBy("orgChild3.orgChild3Order", "ASC")
.getMany() .getMany()
@ -1333,12 +1337,13 @@ export class OrganizationController extends Controller {
"orgChild4.JOB_CODE", "orgChild4.JOB_CODE",
"orgChild4.orgChild3Id", "orgChild4.orgChild3Id",
"orgChild4.responsibility", "orgChild4.responsibility",
"orgChild4.ancestorDNA",
]) ])
.orderBy("orgChild4.orgChild4Order", "ASC") .orderBy("orgChild4.orgChild4Order", "ASC")
.getMany() .getMany()
: []; : [];
// const formattedData = orgRootData.map((orgRoot) => { //return fix // const formattedData = orgRootData.map((orgRoot) => {
const formattedData = await Promise.all( const formattedData = await Promise.all(
orgRootData.map(async (orgRoot) => { orgRootData.map(async (orgRoot) => {
return { return {
@ -1351,6 +1356,7 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + "00", orgCode: orgRoot.orgRootCode + "00",
orgTreeRank: orgRoot.orgRootRank, orgTreeRank: orgRoot.orgRootRank,
orgTreeRankSub: orgRoot.orgRootRankSub, orgTreeRankSub: orgRoot.orgRootRankSub,
orgRootDnaId: orgRoot.ancestorDNA,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE, DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE, DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE, SECTION_CODE: orgRoot.SECTION_CODE,
@ -1466,6 +1472,8 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code, orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
orgTreeRank: orgChild1.orgChild1Rank, orgTreeRank: orgChild1.orgChild1Rank,
orgTreeRankSub: orgChild1.orgChild1RankSub, orgTreeRankSub: orgChild1.orgChild1RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE, DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE, DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE, SECTION_CODE: orgChild1.SECTION_CODE,
@ -1587,6 +1595,9 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code, orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
orgTreeRank: orgChild2.orgChild2Rank, orgTreeRank: orgChild2.orgChild2Rank,
orgTreeRankSub: orgChild2.orgChild2RankSub, orgTreeRankSub: orgChild2.orgChild2RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
orgChild2DnaId: orgChild2.ancestorDNA,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE, DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE, DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE, SECTION_CODE: orgChild2.SECTION_CODE,
@ -1709,6 +1720,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code, orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
orgTreeRank: orgChild3.orgChild3Rank, orgTreeRank: orgChild3.orgChild3Rank,
orgTreeRankSub: orgChild3.orgChild3RankSub, orgTreeRankSub: orgChild3.orgChild3RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
orgChild2DnaId: orgChild2.ancestorDNA,
orgChild3DnaId: orgChild3.ancestorDNA,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE, DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE, DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE, SECTION_CODE: orgChild3.SECTION_CODE,
@ -1831,6 +1846,11 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code, orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
orgTreeRank: orgChild4.orgChild4Rank, orgTreeRank: orgChild4.orgChild4Rank,
orgTreeRankSub: orgChild4.orgChild4RankSub, orgTreeRankSub: orgChild4.orgChild4RankSub,
orgRootDnaId: orgRoot.ancestorDNA,
orgChild1DnaId: orgChild1.ancestorDNA,
orgChild2DnaId: orgChild2.ancestorDNA,
orgChild3DnaId: orgChild3.ancestorDNA,
orgChild4DnaId: orgChild4.ancestorDNA,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE, DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE, DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE, SECTION_CODE: orgChild4.SECTION_CODE,