Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -114,9 +114,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	@Transactional(rollbackFor = Exception.class)
 	public void deleteCourseSchedules(List<Long> courseScheduleIds) {
 		courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
-		courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
-		courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
-		teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
+        courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
+        courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
+        teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
 	}
 
 	@Override
@@ -1289,7 +1289,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		for (StudentAttendance studentAttendance : studentAttendanceList) {
 			studentAttendance.setStatus(StudentAttendanceStatusEnum.TRUANT);
 			studentAttendance.setRemark("课程已结束，自动补旷课");
-			studentAttendance.setCurrentClassTimes(studentAttendance.getCurrentClassTimes() + 1);
+			if(Objects.isNull(studentAttendance.getCurrentClassTimes())){
+                studentAttendance.setCurrentClassTimes(1);
+            }else{
+                studentAttendance.setCurrentClassTimes(studentAttendance.getCurrentClassTimes() + 1);
+            }
 			studentAttendance.setCreateTime(date);
 		}