แก้ชื่อย่อกลุ่มลูกจ้าง
This commit is contained in:
parent
b3114a31d5
commit
037934f0eb
1 changed files with 6 additions and 3 deletions
|
|
@ -335,10 +335,10 @@ export class EmployeePositionController extends Controller {
|
||||||
id: item.id,
|
id: item.id,
|
||||||
posDictName: item.posDictName,
|
posDictName: item.posDictName,
|
||||||
posTypeId: item.posTypeId,
|
posTypeId: item.posTypeId,
|
||||||
posTypeName: `${posTypeShortName} ${posTypeName}`,
|
posTypeName: posTypeName,
|
||||||
posTypeShortName: posTypeShortName,
|
posTypeShortName: posTypeShortName,
|
||||||
posLevelId: item.posLevelId,
|
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,
|
posTypeName: position.posType == null ? null : position.posType.posTypeName,
|
||||||
posTypeShortName: position.posType == null ? null : position.posType.posTypeShortName,
|
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 || position.posType == null
|
||||||
|
? null
|
||||||
|
: `${position.posType.posTypeShortName} ${position.posLevel.posLevelName}`,
|
||||||
positionIsSelected: position.positionIsSelected,
|
positionIsSelected: position.positionIsSelected,
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue