From 85c2f19f13a748cb80f00ec7b9d1f342af8a4504 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 19 Aug 2024 16:48:54 +0700 Subject: [PATCH] fix --- src/controllers/PositionController.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index 1e39dc55..6da78b75 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -3042,8 +3042,6 @@ export class PositionController extends Controller { node = 0; 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 { id: posMaster.id, node: node, @@ -3059,10 +3057,16 @@ export class PositionController extends Controller { orgShortname: shortName, isSit: posMaster.isSit, isPosition: posMaster.positions.filter((x) => x.positionName == body.position).length > 0, - current_holder: posMaster.current_holderId ? posMaster.current_holderId : null, - current_holderName: fullNameCurrentHolder, - next_holder: posMaster.next_holderId ? posMaster.next_holderId : null, - next_holderName: fullNameNextHolder, + // current_holder: posMaster.current_holderId ? posMaster.current_holderId : null, + // next_holder: posMaster.next_holderId ? posMaster.next_holderId : null, + fullNameCurrentHolder: + 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) => ({ id: position.id, positionName: position.positionName,