zouxuan vor 5 Jahren
Ursprung
Commit
f49c6bc6d6

+ 3 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherSalaryModifyLogServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+
 @Service
 public class TeacherSalaryModifyLogServiceImpl extends BaseServiceImpl<Long, TeacherSalaryModifyLog>  implements TeacherSalaryModifyLogService {
 	
@@ -33,7 +35,7 @@ public class TeacherSalaryModifyLogServiceImpl extends BaseServiceImpl<Long, Tea
 		courseScheduleTeacherSalaryDao.updateSalary(modifyLog);
 		//修改教师课酬
 		modifyLog.setPreExpectSalary(salary.getActualSalary());
-		modifyLog.setPreReduceSalary(salary.getReduceSalary());
+		modifyLog.setPreReduceSalary(salary.getReduceSalary()==null? BigDecimal.ZERO:salary.getReduceSalary());
 		return teacherSalaryModifyLogDao.insert(modifyLog);
 	}
 }