From fd736da4c07c41a4a162b1b9f4c2125108ba7285 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 21 May 2025 16:24:24 +0700 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=9C=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B8=95=E0=B8=B3=E0=B9=81?= =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B9=84=E0=B8=A1=E0=B9=88?= =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=20(issue?= =?UTF-8?q?=20#1351)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/CommandController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 9af96752..02c7173f 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -4896,7 +4896,7 @@ export class CommandController extends Controller { const meta = { profileId: item.profileId, commandId: item.commandId, - position: profile.position, + positionName: profile.position, positionType: profile?.posType?.posTypeName ?? null, positionLevel: profile?.posLevel?.posLevelName ?? null, positionExecutive: position?.posExecutive?.posExecutiveName ?? null, From fbef363ca133d309e17d06225117ed879bd50c6a Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 21 May 2025 16:40:51 +0700 Subject: [PATCH 2/3] fix issue #1350 --- src/controllers/CommandController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 02c7173f..bde73c1e 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -5112,7 +5112,7 @@ export class CommandController extends Controller { const profileSalary: ProfileSalary = Object.assign(new ProfileSalary(), { profileId: item.profileId, commandId: item.commandId, - position: profile.position, + positionName: profile.position, positionType: profile?.posType?.posTypeName ?? null, positionLevel: profile?.posLevel?.posLevelName ?? null, positionExecutive: position?.posExecutive?.posExecutiveName ?? null, From 02b84fb3b55081c4a3c1d5305f5338ab00ac6f98 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 22 May 2025 10:11:19 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=9B=E0=B8=A5=E0=B8=94=E0=B9=80?= =?UTF-8?q?=E0=B8=8A=E0=B9=87=E0=B8=84=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98?= =?UTF-8?q?=E0=B8=B4=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileAssistanceController.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/ProfileAssistanceController.ts b/src/controllers/ProfileAssistanceController.ts index 8e1f2642..750638f8 100644 --- a/src/controllers/ProfileAssistanceController.ts +++ b/src/controllers/ProfileAssistanceController.ts @@ -51,9 +51,9 @@ export class ProfileAssistanceController extends Controller { @Get("{profileId}") public async detailProfileAssistance(@Path() profileId: string, @Request() req: RequestWithUser) { - let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_OFFICER"); - if (_workflow == false) - await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); + // let _workflow = await new permission().Workflow(req, profileId, "SYS_REGISTRY_OFFICER"); + // if (_workflow == false) + // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId); const getProfileAssistanceId = await this.profileAssistanceRepo.find({ where: { profileId: profileId }, order: { createdAt: "ASC" },