hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

เพิ่มชื่อย่อระดับชั้นงาน

Browse source
This commit is contained in:
Bright 2024-04-02 13:31:43 +07:00
parent b6f6da142a
commit 662e6772cc
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/EmployeePositionController.ts
View file

@ -247,6 +247,7 @@ export class EmployeePositionController extends Controller {
positionName: position.positionName, positionName: position.positionName,
posTypeId: position.posTypeId, posTypeId: position.posTypeId,
posTypeName: position.posType == null ? null : position.posType.posTypeName, posTypeName: position.posType == null ? null : position.posType.posTypeName,
posTypeShortName: position.posType == null ? null : position.posType.posTypeShortName,
posLevelId: position.posLevelId, posLevelId: position.posLevelId,
posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName, posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
@ -315,6 +316,7 @@ export class EmployeePositionController extends Controller {
findData.map(async (item: any) => { findData.map(async (item: any) => {
let posTypeName = null; let posTypeName = null;
let posLevelName = null; let posLevelName = null;
let posTypeShortName = null;
if (item.posType !== null && item.posType !== undefined) { if (item.posType !== null && item.posType !== undefined) {
posTypeName = item.posType.posTypeName; posTypeName = item.posType.posTypeName;
@ -322,12 +324,16 @@ export class EmployeePositionController extends Controller {
if (item.posLevel !== null && item.posLevel !== undefined) { if (item.posLevel !== null && item.posLevel !== undefined) {
posLevelName = item.posLevel.posLevelName; posLevelName = item.posLevel.posLevelName;
} }
if (item.posType !== null && item.posType !== undefined) {
posTypeShortName = item.posType.posTypeShortName;
}
return { return {
id: item.id, id: item.id,
posDictName: item.posDictName, posDictName: item.posDictName,
posTypeId: item.posTypeId, posTypeId: item.posTypeId,
posTypeName: posTypeName, posTypeName: posTypeName,
posTypeShortName: posTypeShortName,
posLevelId: item.posLevelId, posLevelId: item.posLevelId,
posLevelName: posLevelName, posLevelName: posLevelName,
}; };
@ -1131,6 +1137,7 @@ export class EmployeePositionController extends Controller {
positionName: position.positionName, positionName: position.positionName,
posTypeId: position.posTypeId, posTypeId: position.posTypeId,
posTypeName: position.posType == null ? null : position.posType.posTypeName, posTypeName: position.posType == null ? null : position.posType.posTypeName,
posTypeShortName: position.posType == null ? null : position.posType.posTypeShortName,
posLevelId: position.posLevelId, posLevelId: position.posLevelId,
posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName, posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,