diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index 31c348f6..8b728e7b 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -249,7 +249,10 @@ export class EmployeePositionController extends Controller { posTypeName: position.posType == null ? null : position.posType.posTypeName, posTypeShortName: position.posType == null ? null : position.posType.posTypeShortName, posLevelId: position.posLevelId, - posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName, + posLevelName: + position.posLevel == null || position.posType == null + ? null + : `${position.posType.posTypeShortName} ${position.posLevel.posLevelName}`, positionIsSelected: position.positionIsSelected, })), }; @@ -332,7 +335,7 @@ export class EmployeePositionController extends Controller { id: item.id, posDictName: item.posDictName, posTypeId: item.posTypeId, - posTypeName: posTypeName, + posTypeName: `${posTypeShortName} ${posTypeName}`, posTypeShortName: posTypeShortName, posLevelId: item.posLevelId, posLevelName: posLevelName, @@ -1129,9 +1132,10 @@ export class EmployeePositionController extends Controller { : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, orgShortname: shortName, isSit: posMaster.isSit, - profilePosition: profile == null || profile.position == null ? null : profile.position, - profilePostype: type == null || type.posTypeName == null ? null : type.posTypeName, - profilePoslevel: level == null || level.posLevelName == null ? null : level.posLevelName, + profilePosition: profile == null ? null : profile.position, + profilePostype: type == null ? null : type.posTypeName, + profilePoslevel: + level == null || type == null ? null : `${type.posTypeShortName} ${level.posLevelName}`, positions: positions.map((position) => ({ id: position.id, positionName: position.positionName,