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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-08-19 16:48:54 +07:00
parent 10a3a243d5
commit 85c2f19f13
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/PositionController.ts
View file

@ -3042,8 +3042,6 @@ export class PositionController extends Controller {
node = 0; node = 0;
nodeId = posMaster.orgRootId; nodeId = posMaster.orgRootId;
} }
const fullNameCurrentHolder = posMaster.current_holder?posMaster.current_holder.prefix+posMaster.current_holder.firstName+" "+posMaster.current_holder.lastName:null;
const fullNameNextHolder = posMaster.next_holder?posMaster.next_holder.prefix+posMaster.next_holder.firstName+" "+posMaster.next_holder.lastName:null;
return { return {
id: posMaster.id, id: posMaster.id,
node: node, node: node,
@ -3059,10 +3057,16 @@ export class PositionController extends Controller {
orgShortname: shortName, orgShortname: shortName,
isSit: posMaster.isSit, isSit: posMaster.isSit,
isPosition: posMaster.positions.filter((x) => x.positionName == body.position).length > 0, isPosition: posMaster.positions.filter((x) => x.positionName == body.position).length > 0,
current_holder: posMaster.current_holderId ? posMaster.current_holderId : null, // current_holder: posMaster.current_holderId ? posMaster.current_holderId : null,
current_holderName: fullNameCurrentHolder, // next_holder: posMaster.next_holderId ? posMaster.next_holderId : null,
next_holder: posMaster.next_holderId ? posMaster.next_holderId : null, fullNameCurrentHolder:
next_holderName: fullNameNextHolder, posMaster.current_holder == null
? null
: `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`,
fullNameNextHolder:
posMaster.next_holder == null
? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
positions: posMaster.positions.map((position) => ({ positions: posMaster.positions.map((position) => ({
id: position.id, id: position.id,
positionName: position.positionName, positionName: position.positionName,