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

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2025-02-04 17:18:40 +07:00
commit 64fd9fbba8
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/CommandController.ts
View file

@ -4966,7 +4966,7 @@ export class CommandController extends Controller {
: null; : null;
const metaAct = { const metaAct = {
profileId: item.posMasterChild.current_holderId, profileId: item.posMasterChild.current_holderId,
dateStart: new Date(), dateStart: body.refIds[0].commandAffectDate,
dateEnd: null, dateEnd: null,
posNo: shortName, posNo: shortName,
position: item.posMaster.current_holder.position, position: item.posMaster.current_holder.position,

3
src/controllers/ProfileEmployeeController.ts
View file

@ -4541,8 +4541,7 @@ export class ProfileEmployeeController extends Controller {
position: profile.position, position: profile.position,
leaveDate: profile.dateLeave, leaveDate: profile.dateLeave,
posMasterNo: posMaster == null ? null : posMaster.posMasterNo, posMasterNo: posMaster == null ? null : posMaster.posMasterNo,
posLevelName: posLevelName: `${profile?.posType?.posTypeShortName ?? ""} ${profile?.posLevel?.posLevelName ?? ""}`,
profile?.posType?.posTypeShortName ?? "" + " " + profile?.posLevel?.posLevelName ?? "",
posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank,
posLevelId: profile.posLevel == null ? null : profile.posLevel.id, posLevelId: profile.posLevel == null ? null : profile.posLevel.id,
posTypeName: profile.posType == null ? null : profile.posType.posTypeName, posTypeName: profile.posType == null ? null : profile.posType.posTypeName,