From 9cf79b1660b36b50a8d20cafe96ea2be0d20ab35 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 29 Apr 2025 17:36:53 +0700 Subject: [PATCH] fix --- src/controllers/SalaryPeriodController.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 9e29241..794ccea 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -2797,8 +2797,10 @@ export class SalaryPeriodController extends Controller { }, }); salaryProfileNew.type = salaryOld == null ? 0 : salaryOld.type; - 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; + // salaryProfileNew.group = salaryOld && salaryOld.groupNew ? salaryOld.groupNew : salaryOld?.group; + salaryProfileNew.salaryLevelNew = salaryOld && salaryOld.salaryLevelNew ? salaryOld.salaryLevelNew : null; + salaryProfileNew.groupNew = salaryOld && salaryOld.groupNew ? salaryOld.groupNew : null; salaryProfileNew.amount = salaryOld == null ? 0 : salaryOld.amount; salaryProfileNew.amountSpecial = salaryOld == null ? 0 : salaryOld.amountSpecial; salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;