diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index e9b00917..ee41c1e5 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -170,6 +170,7 @@ export class ReportController extends Controller { "posMaster.orgChild2Id", "posMaster.orgChild3Id", "posMaster.orgChild4Id", + "posMaster.next_holder", ]) .orderBy("posMaster.posMasterOrder", "ASC") .getMany(); @@ -179,6 +180,16 @@ export class ReportController extends Controller { }, relations: ["posLevel", "posType", "posExecutive"], }); + let orgRevisionActive: any = await this.orgRevisionRepository.findOne({ + where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false }, + }); + if (orgRevisionActive == null) { + const _orgRevisionActive = await this.orgRevisionRepository.find({ + order: { orgRevisionCreatedAt: "DESC" }, + skip: 1, + }); + if (_orgRevisionActive.length > 0) orgRevisionActive = _orgRevisionActive[0]; + } let data = new Array(); await Promise.all( @@ -195,6 +206,8 @@ export class ReportController extends Controller { posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNo: posMaster.posMasterNo, posMasterNoSuffix: posMaster.posMasterNoSuffix, + fullname: `${posMaster.next_holder}`, + // fullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, positions: await Promise.all( positions .filter((position) => position.posMasterId === posMaster.id)