diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index 4d14762c..8077b2eb 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -253,11 +253,21 @@ export class EmployeePositionController extends Controller { } const mapDataEmpPosDict = await Promise.all( findData.map(async (item: any) => { + let posTypeName = null; + let posLevelName = null; + + if (item.employeePosType !== null && item.employeePosType !== undefined) { + posTypeName = item.employeePosType.posTypeName; + } + if (item.employeePosLevel !== null && item.employeePosLevel !== undefined) { + posLevelName = item.employeePosLevel.posLevelName; + } + return { id: item.id, posDictName: item.posDictName, - posTypeName: item.posType == null ? null : item.posType.posTypeName, - posLevelName: item.posLevel == null ? null : item.posLevel.posLevelName, + posTypeName: posTypeName, + posLevelName: posLevelName, }; }), );