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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-10 17:38:11 +07:00
parent 95a8d06390
commit eef29b7564
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/ReportController.ts
View file

@ -8832,7 +8832,6 @@ export class ReportController extends Controller {
.then(async () => { .then(async () => {
const before = null; const before = null;
salary.status36 = "DONE"; salary.status36 = "DONE";
salary.salaryLevel = salary?.salaryLevelNew ? salary?.salaryLevelNew : null;
salary.lastUpdateUserId = request.user.sub; salary.lastUpdateUserId = request.user.sub;
salary.lastUpdateFullName = request.user.name; salary.lastUpdateFullName = request.user.name;
salary.lastUpdatedAt = new Date(); salary.lastUpdatedAt = new Date();

1
src/controllers/SalaryPeriodController.ts
View file

@ -2718,6 +2718,7 @@ export class SalaryPeriodController extends Controller {
}, },
}); });
salaryProfileNew.type = salaryOld == null ? 0 : salaryOld.type; salaryProfileNew.type = salaryOld == null ? 0 : salaryOld.type;
salaryProfileNew.salaryLevel = salaryOld && salaryOld.salaryLevelNew ? salaryOld.salaryLevelNew : salaryOld?.salaryLevel;
salaryProfileNew.amount = salaryOld == null ? 0 : salaryOld.amount; salaryProfileNew.amount = salaryOld == null ? 0 : salaryOld.amount;
salaryProfileNew.amountSpecial = salaryOld == null ? 0 : salaryOld.amountSpecial; salaryProfileNew.amountSpecial = salaryOld == null ? 0 : salaryOld.amountSpecial;
salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse; salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;