|
@@ -4644,7 +4644,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
Date date = new Date();
|
|
|
List<Long> courseIds1 = courseSchedules.stream().map(e -> e.getId()).collect(Collectors.toList());
|
|
|
//获取修改日志
|
|
|
- List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseIds1, courseSchedules, user.getId(), date);
|
|
|
+ List<CourseScheduleModifyLog> modifyLogs = new ArrayList<>();
|
|
|
+ if(!CollectionUtils.isEmpty(courseIds1)){
|
|
|
+ modifyLogs = getModifyLogs(courseIds1, courseSchedules, user.getId(), date);
|
|
|
+ }
|
|
|
|
|
|
PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(practiceGroupId));
|
|
|
|
|
@@ -4720,7 +4723,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
//清除考勤申述
|
|
|
teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
|
|
|
//保存修改记录
|
|
|
- saveModifyLog(modifyLogs,courseIds1);
|
|
|
+ if(!CollectionUtils.isEmpty(modifyLogs))
|
|
|
+ saveModifyLog(modifyLogs,courseIds1);
|
|
|
|
|
|
if (teacherIdMap != null && teacherIdMap.size() > 0) {
|
|
|
sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_COURSE_SCHEDULE_CHANGE_RESULT,
|