diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index 8b728e7b..68a564c0 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -335,10 +335,10 @@ export class EmployeePositionController extends Controller { id: item.id, posDictName: item.posDictName, posTypeId: item.posTypeId, - posTypeName: `${posTypeShortName} ${posTypeName}`, + posTypeName: posTypeName, posTypeShortName: posTypeShortName, posLevelId: item.posLevelId, - posLevelName: posLevelName, + posLevelName: `${posTypeShortName} ${posLevelName}`, }; }), ); @@ -1143,7 +1143,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, })), };