From b678d379fa9c2d82d9c4ea199597f7a6e364118f Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Tue, 10 Sep 2024 14:16:57 +0800
Subject: [PATCH] update

---
 .../java/com/ffii/tsms/modules/data/service/StaffsService.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
index 55fc1bd..821b6b3 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
@@ -291,6 +291,8 @@ open class StaffsService(
         }
 //        salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong())
         if (
+            !req.salaryEffectiveInfo.isNullOrEmpty() &&
+            !req.delSalaryEffectiveInfo.isNullOrEmpty() &&
             !req.teamHistory.isNullOrEmpty() &&
             !req.delTeamHistory.isNullOrEmpty() &&
             !req.gradeHistory.isNullOrEmpty() &&
@@ -298,11 +300,10 @@ open class StaffsService(
             !req.positionHistory.isNullOrEmpty() &&
             !req.delPositionHistory.isNullOrEmpty()
             ) {
-                salaryEffectiveService.updateSalaryEffective(staff.id!!, req.salaryEffectiveInfo?.sortedBy { it.date }, req.delSalaryEffectiveInfo)
+                salaryEffectiveService.updateSalaryEffective(staff.id!!, req.salaryEffectiveInfo.sortedBy { it.date }, req.delSalaryEffectiveInfo)
                 teamLogService.editTeamLog(req.teamHistory, req.delTeamHistory)
                 gradeLogService.editGradeLog(req.gradeHistory, req.delGradeHistory)
                 positionLogService.editPositionLog(req.positionHistory, req.delPositionHistory)
-
         }
         return staffRepository.save(staff)
     }