From 14b4575f62dd0b5f2934033ae96aecb29149014b Mon Sep 17 00:00:00 2001 From: Adisak Date: Tue, 25 Nov 2025 14:39:03 +0700 Subject: [PATCH 1/2] #2030 --- src/controllers/SalaryPeriodController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 19ccedd..57b3a30 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -2276,7 +2276,7 @@ export class SalaryPeriodController extends Controller { if (chk_period) { throw new HttpError( HttpStatusCode.NOT_FOUND, - "ประเภทผังปี " + (requestBody.effectiveDate.getFullYear() + 543) + " ซ้ำ", + "ประเภทผังปี " + (requestBody.year + 543) + " ซ้ำ", ); } const beforeChk_SalaryPeriod = structuredClone(chk_SalaryPeriod); From 508cb5643059038f4a4d45bbe65b2623c19fcb94 Mon Sep 17 00:00:00 2001 From: Adisak Date: Tue, 25 Nov 2025 17:14:10 +0700 Subject: [PATCH 2/2] #2034 --- src/controllers/SalaryPeriodEmployeeController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts index 86e9702..1f1abae 100644 --- a/src/controllers/SalaryPeriodEmployeeController.ts +++ b/src/controllers/SalaryPeriodEmployeeController.ts @@ -952,7 +952,7 @@ export class SalaryPeriodEmployeeController extends Controller { salaryProfile.remark = body.remark == null ? _null : body.remark; let type = salaryProfile.type; - salaryProfile = await this.calSalary(type, salaryProfile); + salaryProfile = await this.calSalaryNew(type, salaryProfile); salaryProfile.lastUpdateUserId = req.user.sub; salaryProfile.lastUpdateFullName = req.user.name;