diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 35afa13e..0e465565 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2617,7 +2617,9 @@ export class CommandController extends Controller { if(_posMasterCommission) { _data.push({ citizenId: _posMasterCommission?.current_holder.citizenId ?? _null, - fullName: `${_posMasterCommission?.current_holder.prefix ?? ""}${_posMasterCommission?.current_holder.firstName ?? ""} ${_posMasterCommission?.current_holder.lastName ?? ""}`, + prefix: _posMasterCommission?.current_holder.prefix, + firstName: _posMasterCommission?.current_holder.firstName, + lastName: _posMasterCommission?.current_holder.lastName, organizationName: _posMasterCommission.orgRoot ? _posMasterCommission.orgRoot.orgRootName : _null, @@ -2642,7 +2644,9 @@ export class CommandController extends Controller { if(_posMasterOfficer) { _data.push({ citizenId: _posMasterOfficer?.current_holder.citizenId ?? _null, - fullName: `${_posMasterOfficer?.current_holder.prefix ?? ""}${_posMasterOfficer?.current_holder.firstName ?? ""} ${_posMasterOfficer?.current_holder.lastName ?? ""}`, + prefix: _posMasterOfficer?.current_holder.prefix, + firstName: _posMasterOfficer?.current_holder.firstName, + lastName: _posMasterOfficer?.current_holder.lastName, organizationName: _posMasterOfficer.orgRoot ? _posMasterOfficer.orgRoot.orgRootName : _null, @@ -2741,7 +2745,9 @@ export class CommandController extends Controller { _posMaster.forEach((x:any) => { _data.push({ citizenId: x?.current_holder.citizenId ?? _null, - fullName: `${x?.current_holder.prefix ?? ""}${x?.current_holder.firstName ?? ""} ${x?.current_holder.lastName ?? ""}`, + prefix: x?.current_holder.prefix, + firstName: x?.current_holder.firstName, + lastName: x?.current_holder.lastName, organizationName: x.orgRoot ? x.orgRoot.orgRootName : _null, positionName: x?.current_holder.position ?? _null, profileId: x?.current_holder.id ?? _null