| @@ -314,21 +314,16 @@ open class StaffsService( | |||||
| userRepository.save(user) | userRepository.save(user) | ||||
| } | } | ||||
| // salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong()) | // salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong()) | ||||
| if ( | |||||
| !req.salaryEffectiveInfo.isNullOrEmpty() && | |||||
| !req.delSalaryEffectiveInfo.isNullOrEmpty() && | |||||
| !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) | |||||
| if (req.salaryEffectiveInfo != null && req.delSalaryEffectiveInfo != null) { | |||||
| salaryEffectiveService.updateSalaryEffective(staff.id!!, req.salaryEffectiveInfo.sortedBy { it.date }, req.delSalaryEffectiveInfo) | |||||
| } else if (req.teamHistory != null && req.delTeamHistory != null) { | |||||
| teamLogService.editTeamLog(req.teamHistory, req.delTeamHistory) | |||||
| } else if (req.gradeHistory != null && req.delGradeHistory != null) { | |||||
| gradeLogService.editGradeLog(req.gradeHistory, req.delGradeHistory) | |||||
| } else if (req.positionHistory != null && req.delPositionHistory != null) { | |||||
| positionLogService.editPositionLog(req.positionHistory, req.delPositionHistory) | |||||
| } | } | ||||
| return staffRepository.save(staff) | return staffRepository.save(staff) | ||||
| } | } | ||||