hrms-bangkok/hrms-api-salary
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev

Browse source 
* develop:
  #2034
  #2030
This commit is contained in:
Warunee Tamkoo 2025-11-26 21:40:43 +07:00
commit cbcdae7b71
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/SalaryPeriodController.ts
View file

@ -2276,7 +2276,7 @@ export class SalaryPeriodController extends Controller {
if (chk_period) { if (chk_period) {
throw new HttpError( throw new HttpError(
HttpStatusCode.NOT_FOUND, HttpStatusCode.NOT_FOUND,
"ประเภทผังปี " + (requestBody.effectiveDate.getFullYear() + 543) + " ซ้ำ", "ประเภทผังปี " + (requestBody.year + 543) + " ซ้ำ",
); );
} }
const beforeChk_SalaryPeriod = structuredClone(chk_SalaryPeriod); const beforeChk_SalaryPeriod = structuredClone(chk_SalaryPeriod);

2
src/controllers/SalaryPeriodEmployeeController.ts
View file

@ -952,7 +952,7 @@ export class SalaryPeriodEmployeeController extends Controller {
salaryProfile.remark = body.remark == null ? _null : body.remark; salaryProfile.remark = body.remark == null ? _null : body.remark;
let type = salaryProfile.type; let type = salaryProfile.type;
salaryProfile = await this.calSalary(type, salaryProfile); salaryProfile = await this.calSalaryNew(type, salaryProfile);
salaryProfile.lastUpdateUserId = req.user.sub; salaryProfile.lastUpdateUserId = req.user.sub;
salaryProfile.lastUpdateFullName = req.user.name; salaryProfile.lastUpdateFullName = req.user.name;