From 84ebb4a11b2dda11bb0026fd84bb835627da40b4 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 20 Dec 2024 11:52:34 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B9=80?= =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=81=E0=B8=AA=E0=B8=94?= =?UTF-8?q?=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/CommandController.ts | 2 ++ src/controllers/ProfileController.ts | 1 + src/controllers/ProfileDevelopmentController.ts | 2 +- src/controllers/ProfileEmployeeController.ts | 3 ++- src/controllers/ProfileEmployeeTempController.ts | 3 ++- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index ae303916..614051e8 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -1734,12 +1734,14 @@ export class CommandController extends Controller { }); } commandRecive.amount = salaryData ? salaryData.amount : null_; + commandRecive.amountSpecial = salaryData ? salaryData.amountSpecial : null_; commandRecive.positionSalaryAmount = salaryData ? salaryData.positionSalaryAmount : null_; commandRecive.mouthSalaryAmount = salaryData ? salaryData.mouthSalaryAmount : null_; } else { commandRecive.amount = null_; + commandRecive.amountSpecial = null_; commandRecive.positionSalaryAmount = null_; commandRecive.mouthSalaryAmount = null_; } diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index ed5a1e4b..be236f11 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -4863,6 +4863,7 @@ export class ProfileController extends Controller { node: null, nodeId: null, salary: profile ? profile.amount : null, + amountSpecial: profile ? profile.amountSpecial : null }; if (_profile.child4Id != null) { diff --git a/src/controllers/ProfileDevelopmentController.ts b/src/controllers/ProfileDevelopmentController.ts index b9017db8..1d9149dd 100644 --- a/src/controllers/ProfileDevelopmentController.ts +++ b/src/controllers/ProfileDevelopmentController.ts @@ -172,7 +172,7 @@ export class ProfileDevelopmentController extends Controller { summary: null, point: null, name: data.name, - achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน1", + achievement10: "มีผลการพัฒนาและมีการดำเนินการตามเป้าหมายการนำไปพัฒนางาน", achievement5: "มีผลการพัฒนาแต่ยังไม่ได้ดำเนินการตามเป้าหมายการนำไปพัฒนางาน", achievement0: "ไม่ได้ดำเนินการพัฒนา", isDevelopment70: data.isDevelopment70, diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index d9d2f070..dff5fe59 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2064,7 +2064,8 @@ export class ProfileEmployeeController extends Controller { child4ShortName: child4 == null ? null : child4.orgChild4ShortName, node: null, nodeId: null, - salary: profile.amount, + salary: profile ? profile.amount : null, + amountSpecial: profile ? profile.amountSpecial : null }; return new HttpSuccess(_profile); } diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index addb4af8..52bed431 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -1866,7 +1866,8 @@ export class ProfileEmployeeTempController extends Controller { ? null : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 .orgChild4Name, - salary: profile.amount, + salary: profile ? profile.amount : null, + amountSpecial: profile ? profile.amountSpecial : null }; return new HttpSuccess(_profile); }