diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 1d9eee4e..0d76392c 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2806,7 +2806,9 @@ export class ProfileEmployeeController extends Controller { name: fullName, birthDate: item.birthDate, positionLevel: item.posLevelId, - positionLevelName: item.posLevel?.posLevelName, + positionLevelName: item.posLevel == null && item.posType == null + ? null + : `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`, positionType: item.posTypeId, positionTypeName: item.posType?.posTypeName, posNo: shortName, @@ -4625,7 +4627,9 @@ export class ProfileEmployeeController extends Controller { name: fullName, birthDate: item.birthDate, positionLevel: item.posLevelId, - positionLevelName: item.posLevel?.posLevelName, + positionLevelName: item.posLevel == null && item.posType == null + ? null + : `${item.posType?.posTypeShortName} ${item.posLevel?.posLevelName}`, positionType: item.posTypeId, positionTypeName: item.posType?.posTypeName, posNo: shortName,