diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 78ffd155..ff88a6a4 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -4918,7 +4918,7 @@ export class CommandController extends Controller { }); const data = posMasters.map((_data) => ({ ..._data, - statusReport: "PENDING", + statusReport: "DONE", })); await this.posMasterActRepository.save(data); diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 85290143..b854ce7e 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -4541,7 +4541,8 @@ export class ProfileEmployeeController extends Controller { position: profile.position, leaveDate: profile.dateLeave, posMasterNo: posMaster == null ? null : posMaster.posMasterNo, - posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName, + posLevelName: + profile?.posType?.posTypeShortName ?? "" + " " + profile?.posLevel?.posLevelName ?? "", posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelId: profile.posLevel == null ? null : profile.posLevel.id, posTypeName: profile.posType == null ? null : profile.posType.posTypeName,