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

fix การค้นหา labelName #2573
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m6s
Details

Browse source
This commit is contained in:
harid 2026-06-22 10:06:59 +07:00
parent 41862b8dca
commit bbc6a5e6a9
1 changed files with 74 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/controllers/OrganizationController.ts
View file

@ -1441,7 +1441,14 @@ export class OrganizationController extends Controller {
orgRoot.orgRootCode + orgRoot.orgRootCode +
orgChild1.orgChild1Code + orgChild1.orgChild1Code +
" " + " " +
orgChild1.orgChild1ShortName, orgChild1.orgChild1ShortName +
"/" +
orgRoot.orgRootName +
" " +
orgRoot.orgRootCode +
"00" +
" " +
orgRoot.orgRootShortName,
// totalPosition: child1Counts.totalPosition, // totalPosition: child1Counts.totalPosition,
// totalPositionCurrentUse: child1Counts.totalPositionCurrentUse, // totalPositionCurrentUse: child1Counts.totalPositionCurrentUse,
// totalPositionCurrentVacant: child1Counts.totalPositionCurrentVacant, // totalPositionCurrentVacant: child1Counts.totalPositionCurrentVacant,
@ -1491,7 +1498,21 @@ export class OrganizationController extends Controller {
orgRoot.orgRootCode + orgRoot.orgRootCode +
orgChild2.orgChild2Code + orgChild2.orgChild2Code +
" " + " " +
orgChild2.orgChild2ShortName, orgChild2.orgChild2ShortName +
"/" +
orgChild1.orgChild1Name +
" " +
orgRoot.orgRootCode +
orgChild1.orgChild1Code +
" " +
orgChild1.orgChild1ShortName +
"/" +
orgRoot.orgRootName +
" " +
orgRoot.orgRootCode +
"00" +
" " +
orgRoot.orgRootShortName,
// totalPosition: child2Counts.totalPosition, // totalPosition: child2Counts.totalPosition,
// totalPositionCurrentUse: child2Counts.totalPositionCurrentUse, // totalPositionCurrentUse: child2Counts.totalPositionCurrentUse,
// totalPositionCurrentVacant: child2Counts.totalPositionCurrentVacant, // totalPositionCurrentVacant: child2Counts.totalPositionCurrentVacant,
@ -1542,7 +1563,28 @@ export class OrganizationController extends Controller {
orgRoot.orgRootCode + orgRoot.orgRootCode +
orgChild3.orgChild3Code + orgChild3.orgChild3Code +
" " + " " +
orgChild3.orgChild3ShortName, orgChild3.orgChild3ShortName +
"/" +
orgChild2.orgChild2Name +
" " +
orgRoot.orgRootCode +
orgChild2.orgChild2Code +
" " +
orgChild2.orgChild2ShortName +
"/" +
orgChild1.orgChild1Name +
" " +
orgRoot.orgRootCode +
orgChild1.orgChild1Code +
" " +
orgChild1.orgChild1ShortName +
"/" +
orgRoot.orgRootName +
" " +
orgRoot.orgRootCode +
"00" +
" " +
orgRoot.orgRootShortName,
// totalPosition: child3Counts.totalPosition, // totalPosition: child3Counts.totalPosition,
// totalPositionCurrentUse: child3Counts.totalPositionCurrentUse, // totalPositionCurrentUse: child3Counts.totalPositionCurrentUse,
// totalPositionCurrentVacant: child3Counts.totalPositionCurrentVacant, // totalPositionCurrentVacant: child3Counts.totalPositionCurrentVacant,
@ -1595,7 +1637,35 @@ export class OrganizationController extends Controller {
orgRoot.orgRootCode + orgRoot.orgRootCode +
orgChild4.orgChild4Code + orgChild4.orgChild4Code +
" " + " " +
orgChild4.orgChild4ShortName, orgChild4.orgChild4ShortName +
"/" +
orgChild3.orgChild3Name +
" " +
orgRoot.orgRootCode +
orgChild3.orgChild3Code +
" " +
orgChild3.orgChild3ShortName +
"/" +
orgChild2.orgChild2Name +
" " +
orgRoot.orgRootCode +
orgChild2.orgChild2Code +
" " +
orgChild2.orgChild2ShortName +
"/" +
orgChild1.orgChild1Name +
" " +
orgRoot.orgRootCode +
orgChild1.orgChild1Code +
" " +
orgChild1.orgChild1ShortName +
"/" +
orgRoot.orgRootName +
" " +
orgRoot.orgRootCode +
"00" +
" " +
orgRoot.orgRootShortName,
// totalPosition: child4Counts.totalPosition, // totalPosition: child4Counts.totalPosition,
// totalPositionCurrentUse: child4Counts.totalPositionCurrentUse, // totalPositionCurrentUse: child4Counts.totalPositionCurrentUse,
// totalPositionCurrentVacant: child4Counts.totalPositionCurrentVacant, // totalPositionCurrentVacant: child4Counts.totalPositionCurrentVacant,