update

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)
     }