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

fix #1124

Browse source
This commit is contained in:
AdisakKanthawilang 2024-11-05 15:36:26 +07:00
parent 66774818ca
commit 23b5a12804
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/OrganizationController.ts
View file

@ -5373,11 +5373,11 @@ export class OrganizationController extends Controller {
posMaster: await Promise.all(
orgRoot.posMasters
.filter(
(x) => x.orgChild1Id == null && x.current_holderId != null && x.posMasterOrder <= 3,
(x) => x.orgChild1Id == null && x.current_holderId != null && x.posMasterOrder <= 3 && x.isDirector === true,
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgRoot.orgRootShortName + x.posMasterNo: null,
posNo: orgRoot.orgRootShortName + x.posMasterNo,
orgTreeId: orgRoot.id,
orgLevel: 0,
fullNameCurrentHolder:
@ -5412,11 +5412,12 @@ export class OrganizationController extends Controller {
(x) =>
x.orgChild2Id == null &&
x.current_holderId != null &&
x.posMasterOrder <= 3,
x.posMasterOrder <= 3 &&
x.isDirector === true
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild1.orgChild1ShortName + x.posMasterNo: null,
posNo: orgChild1.orgChild1ShortName + x.posMasterNo,
orgTreeId: orgChild1.id,
orgLevel: 1,
fullNameCurrentHolder:
@ -5452,11 +5453,12 @@ export class OrganizationController extends Controller {
(x) =>
x.orgChild3Id == null &&
x.current_holderId != null &&
x.posMasterOrder <= 3,
x.posMasterOrder <= 3 &&
x.isDirector === true,
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild2.orgChild2ShortName + x.posMasterNo: null,
posNo: orgChild2.orgChild2ShortName + x.posMasterNo,
orgTreeId: orgChild2.id,
orgLevel: 2,
fullNameCurrentHolder:
@ -5492,11 +5494,12 @@ export class OrganizationController extends Controller {
(x) =>
x.orgChild4Id == null &&
x.current_holderId != null &&
x.posMasterOrder <= 3,
x.posMasterOrder <= 3 &&
x.isDirector === true,
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild3.orgChild3ShortName + x.posMasterNo: null,
posNo: orgChild3.orgChild3ShortName + x.posMasterNo,
orgTreeId: orgChild3.id,
orgLevel: 3,
fullNameCurrentHolder:
@ -5529,11 +5532,11 @@ export class OrganizationController extends Controller {
posMaster: await Promise.all(
orgChild4.posMasters
.filter(
(x) => x.current_holderId != null && x.posMasterOrder <= 3,
(x) => x.current_holderId != null && x.posMasterOrder <= 3 && x.isDirector === true,
)
.map(async (x) => ({
posmasterId: x.id,
posNo: x.isDirector == true ? orgChild4.orgChild4ShortName + x.posMasterNo: null,
posNo: orgChild4.orgChild4ShortName + x.posMasterNo,
orgTreeId: orgChild4.id,
orgLevel: 4,
fullNameCurrentHolder: