From eef29b7564f07fa2b0821c0a1bfac4cd8723a1e3 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 10 Apr 2025 17:38:11 +0700
Subject: [PATCH] fix

---
 src/controllers/ReportController.ts       | 1 -
 src/controllers/SalaryPeriodController.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index d6a2d3f..282dc18 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -8832,7 +8832,6 @@ export class ReportController extends Controller {
             .then(async () => {
               const before = null;
               salary.status36 = "DONE";
-              salary.salaryLevel = salary?.salaryLevelNew ? salary?.salaryLevelNew : null;
               salary.lastUpdateUserId = request.user.sub;
               salary.lastUpdateFullName = request.user.name;
               salary.lastUpdatedAt = new Date();
diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 28badc8..83b9ae6 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -2718,6 +2718,7 @@ export class SalaryPeriodController extends Controller {
                 },
               });
               salaryProfileNew.type = salaryOld == null ? 0 : salaryOld.type;
+              salaryProfileNew.salaryLevel = salaryOld && salaryOld.salaryLevelNew ? salaryOld.salaryLevelNew : salaryOld?.salaryLevel;
               salaryProfileNew.amount = salaryOld == null ? 0 : salaryOld.amount;
               salaryProfileNew.amountSpecial = salaryOld == null ? 0 : salaryOld.amountSpecial;
               salaryProfileNew.amountUse = salaryOld == null ? 0 : salaryOld.amountUse;