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

fix merge config

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-28 10:55:18 +07:00
parent 3e84da2c50
commit 9fa7f91732
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/SalaryPeriodController.ts
View file

@ -2797,15 +2797,8 @@ export class SalaryPeriodController extends Controller {
},
});
salaryProfileNew.type = salaryOld == null ? 0 : salaryOld.type;
<<<<<<< HEAD
salaryProfileNew.salaryLevel = salaryOld && salaryOld.salaryLevelNew ? salaryOld.salaryLevelNew : salaryOld?.salaryLevel;
salaryProfileNew.group = salaryOld && salaryOld.groupNew ? salaryOld.groupNew : salaryOld?.group;
=======
salaryProfileNew.salaryLevel =
salaryOld && salaryOld.salaryLevelNew
? salaryOld.salaryLevelNew
: salaryOld?.salaryLevel;
>>>>>>> develop
salaryProfileNew.amount = salaryOld == null ? 0 : salaryOld.amount;
salaryProfileNew.amountSpecial = salaryOld == null ? 0 : salaryOld.amountSpecial;
salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;