From 57c9a84c40a1a0c6c5e90c85da89ff409a03a08f Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 22 Sep 2025 15:59:21 +0700 Subject: [PATCH] no message --- src/controllers/ReportController.ts | 55 +++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index ac0b0cbb..d98800b0 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -4592,11 +4592,6 @@ export class ReportController extends Controller { (x: any) => x.orgRevisionId == orgRevisionActive.id && x.ancestorDNA == posMaster.ancestorDNA, ); - // if (positionMasterOld && positionMasterOld.positions) { - // profilePositionName = [ - // ...new Set(positionMasterOld.positions.map((x: any) => x.positionName)), - // ]; - // } if (positionMasterOld && positionMasterOld.positions) { profilePositionName = [ ...new Set(positionMasterOld.positions.map((x: any) => x.positionName)), @@ -4822,12 +4817,18 @@ export class ReportController extends Controller { if (_node == null) { const head = { posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()), - profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()), + profileFullname: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgName.toString()) + : Extension.ToThaiNumber(node.orgTreeName.toString()), posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()), positionName: "", posType: "", posLevel: "", - profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()), + profilePosMasterNo: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgShortName.toString()) + : Extension.ToThaiNumber(node.orgTreeShortName.toString()), profilePosExecutive: "", profilePositionName: "", profilePosType: "", @@ -5237,12 +5238,18 @@ export class ReportController extends Controller { if (_node == null) { const head = { posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()), - profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()), + profileFullname: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgName.toString()) + : Extension.ToThaiNumber(node.orgTreeName.toString()), posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()), positionName: "", posType: "", posLevel: "", - profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()), + profilePosMasterNo: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgShortName.toString()) + : Extension.ToThaiNumber(node.orgTreeShortName.toString()), profilePosExecutive: "", profilePositionName: "", profilePosType: "", @@ -5659,12 +5666,18 @@ export class ReportController extends Controller { if (_node == null) { const head = { posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()), - profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()), + profileFullname: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgName.toString()) + : Extension.ToThaiNumber(node.orgTreeName.toString()), posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()), positionName: "", posType: "", posLevel: "", - profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()), + profilePosMasterNo: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgShortName.toString()) + : Extension.ToThaiNumber(node.orgTreeShortName.toString()), profilePosExecutive: "", profilePositionName: "", profilePosType: "", @@ -6082,12 +6095,18 @@ export class ReportController extends Controller { if (_node == null) { const head = { posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()), - profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()), + profileFullname: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgName.toString()) + : Extension.ToThaiNumber(node.orgTreeName.toString()), posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()), positionName: "", posType: "", posLevel: "", - profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()), + profilePosMasterNo: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgShortName.toString()) + : Extension.ToThaiNumber(node.orgTreeShortName.toString()), profilePosExecutive: "", profilePositionName: "", profilePosType: "", @@ -6512,12 +6531,18 @@ export class ReportController extends Controller { if (_node == null) { const head = { posMasterNo: Extension.ToThaiNumber(node.orgTreeShortName.toString()), - profileFullname: Extension.ToThaiNumber(node.profileOrgName.toString()), + profileFullname: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgName.toString()) + : Extension.ToThaiNumber(node.orgTreeName.toString()), posExecutive: Extension.ToThaiNumber(node.orgTreeName.toString()), positionName: "", posType: "", posLevel: "", - profilePosMasterNo: Extension.ToThaiNumber(node.profileOrgShortName.toString()), + profilePosMasterNo: + posMaster.next_holder == null + ? Extension.ToThaiNumber(node.profileOrgShortName.toString()) + : Extension.ToThaiNumber(node.orgTreeShortName.toString()), profilePosExecutive: "", profilePositionName: "", profilePosType: "",