From 02f19d66ad75a20b073be74f2a54bc48adc2c380 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 22 Sep 2025 12:05:45 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A=E0=B8=B5?= =?UTF-8?q?=202=20=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B9=88=E0=B8=B2?= =?UTF-8?q?=E0=B8=87=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B8=84=E0=B8=A3=E0=B8=9A=20#164?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ReportController.ts | 109 ++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 29 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 811a2c8b..ac0b0cbb 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -4592,11 +4592,11 @@ 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)), + // ]; + // } if (positionMasterOld && positionMasterOld.positions) { profilePositionName = [ ...new Set(positionMasterOld.positions.map((x: any) => x.positionName)), @@ -4684,6 +4684,11 @@ export class ReportController extends Controller { } } } + if (positionMasterProfileOld == null && posMaster.next_holder != null + && posMaster.next_holder.current_holders == null + ) { + positionMasterProfileOld = positionMasterOld + } let node = { posMasterOrder: posMaster.posMasterOrder, // isSit: posMaster.isSit, // @@ -4783,17 +4788,23 @@ export class ReportController extends Controller { ? positionMasterOld == null ? posType.join(" หรือ ") : profilePosType.join(" หรือ ") - : posMaster.next_holder.posType == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posType.posTypeName, + // : posMaster.next_holder.posType.posTypeName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posType?.posTypeName, profilePosLevel: posMaster.next_holder == null ? positionMasterOld == null ? posLevel.join(" หรือ ") : profilePosLevel.join(" หรือ ") - : posMaster.next_holder.posLevel == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posLevel.posLevelName, + // : posMaster.next_holder.posLevel.posLevelName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posLevel?.posLevelName, profilePosExecutive: posMaster.next_holder == null ? positionMasterOld == null @@ -5087,7 +5098,11 @@ export class ReportController extends Controller { } } } - + if (positionMasterProfileOld == null && posMaster.next_holder != null + && posMaster.next_holder.current_holders == null + ) { + positionMasterProfileOld = positionMasterOld + } let node = { posMasterOrder: posMaster.posMasterOrder, // isSit: posMaster.isSit, // @@ -5188,17 +5203,23 @@ export class ReportController extends Controller { ? positionMasterOld == null ? posType.join(" หรือ ") : profilePosType.join(" หรือ ") - : posMaster.next_holder.posType == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posType.posTypeName, + // : posMaster.next_holder.posType.posTypeName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posType?.posTypeName, profilePosLevel: posMaster.next_holder == null ? positionMasterOld == null ? posLevel.join(" หรือ ") : profilePosLevel.join(" หรือ ") - : posMaster.next_holder.posLevel == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posLevel.posLevelName, + // : posMaster.next_holder.posLevel.posLevelName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posLevel?.posLevelName, profilePosExecutive: posMaster.next_holder == null ? positionMasterOld == null @@ -5499,7 +5520,11 @@ export class ReportController extends Controller { } } } - + if (positionMasterProfileOld == null && posMaster.next_holder != null + && posMaster.next_holder.current_holders == null + ) { + positionMasterProfileOld = positionMasterOld + } let node = { posMasterOrder: posMaster.posMasterOrder, // isSit: posMaster.isSit, // @@ -5600,17 +5625,23 @@ export class ReportController extends Controller { ? positionMasterOld == null ? posType.join(" หรือ ") : profilePosType.join(" หรือ ") - : posMaster.next_holder.posType == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posType.posTypeName, + // : posMaster.next_holder.posType.posTypeName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posType?.posTypeName, profilePosLevel: posMaster.next_holder == null ? positionMasterOld == null ? posLevel.join(" หรือ ") : profilePosLevel.join(" หรือ ") - : posMaster.next_holder.posLevel == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posLevel.posLevelName, + // : posMaster.next_holder.posLevel.posLevelName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posLevel?.posLevelName, profilePosExecutive: posMaster.next_holder == null ? positionMasterOld == null @@ -5912,7 +5943,11 @@ export class ReportController extends Controller { } } } - + if (positionMasterProfileOld == null && posMaster.next_holder != null + && posMaster.next_holder.current_holders == null + ) { + positionMasterProfileOld = positionMasterOld + } let node = { posMasterOrder: posMaster.posMasterOrder, // isSit: posMaster.isSit, // @@ -6013,17 +6048,23 @@ export class ReportController extends Controller { ? positionMasterOld == null ? posType.join(" หรือ ") : profilePosType.join(" หรือ ") - : posMaster.next_holder.posType == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posType.posTypeName, + // : posMaster.next_holder.posType.posTypeName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posType?.posTypeName, profilePosLevel: posMaster.next_holder == null ? positionMasterOld == null ? posLevel.join(" หรือ ") : profilePosLevel.join(" หรือ ") - : posMaster.next_holder.posLevel == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posLevel.posLevelName, + // : posMaster.next_holder.posLevel.posLevelName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posLevel?.posLevelName, profilePosExecutive: posMaster.next_holder == null ? positionMasterOld == null @@ -6332,7 +6373,11 @@ export class ReportController extends Controller { } } } - + if (positionMasterProfileOld == null && posMaster.next_holder != null + && posMaster.next_holder.current_holders == null + ) { + positionMasterProfileOld = positionMasterOld + } let node = { posMasterOrder: posMaster.posMasterOrder, // isSit: posMaster.isSit, // @@ -6433,17 +6478,23 @@ export class ReportController extends Controller { ? positionMasterOld == null ? posType.join(" หรือ ") : profilePosType.join(" หรือ ") - : posMaster.next_holder.posType == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posType.posTypeName, + // : posMaster.next_holder.posType.posTypeName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posType?.posTypeName, profilePosLevel: posMaster.next_holder == null ? positionMasterOld == null ? posLevel.join(" หรือ ") : profilePosLevel.join(" หรือ ") - : posMaster.next_holder.posLevel == null + : positionMasterProfileOld == null ? "-" - : posMaster.next_holder.posLevel.posLevelName, + // : posMaster.next_holder.posLevel.posLevelName, + : positionMasterProfileOld.positions.find( + (x: any) => x.positionIsSelected == true, + )?.posLevel?.posLevelName, profilePosExecutive: posMaster.next_holder == null ? positionMasterOld == null