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

---
 .../tsms/modules/data/service/StaffsService.kt | 18 ++++++++++++++----
 .../modules/data/web/models/NewStaffRequest.kt | 14 +++++++-------
 2 files changed, 21 insertions(+), 11 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 6772c61..55fc1bd 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
@@ -290,10 +290,20 @@ open class StaffsService(
             userRepository.save(user)
         }
 //        salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong())
-        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)
+        if (
+            !req.teamHistory.isNullOrEmpty() &&
+            !req.delTeamHistory.isNullOrEmpty() &&
+            !req.gradeHistory.isNullOrEmpty() &&
+            !req.delGradeHistory.isNullOrEmpty() &&
+            !req.positionHistory.isNullOrEmpty() &&
+            !req.delPositionHistory.isNullOrEmpty()
+            ) {
+                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)
     }
 
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt b/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt
index 8f64142..e923a38 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/models/NewStaffRequest.kt
@@ -38,13 +38,13 @@ data class NewStaffRequest(
     val departReason: String?,
     val remark: String?,
     val salaryEffectiveInfo: List<SalaryEffectiveInfo>?,
-    val teamHistory: List<TeamHistory>,
-    val gradeHistory: List<GradeHistory>,
-    val positionHistory: List<PositionHistory>,
-    val delSalaryEffectiveInfo: List<Long>,
-    val delTeamHistory: List<Long>,
-    val delGradeHistory: List<Long>,
-    val delPositionHistory: List<Long>,
+    val teamHistory: List<TeamHistory>?,
+    val gradeHistory: List<GradeHistory>?,
+    val positionHistory: List<PositionHistory>?,
+    val delSalaryEffectiveInfo: List<Long>?,
+    val delTeamHistory: List<Long>?,
+    val delGradeHistory: List<Long>?,
+    val delPositionHistory: List<Long>?,
 )
 
 data class SalaryEffectiveInfo(