From c22da27f006f5da8a456994be00ab87c85869779 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 4 Feb 2025 16:36:50 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=81=E0=B8=A9=E0=B8=B2?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=20done?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/CommandController.ts | 2 +- src/controllers/ProfileEmployeeController.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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,