|
@@ -2967,8 +2967,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
// 修改了主教/助教/课程状态,需修改考勤记录
|
|
|
List<TeacherAttendance> teacherAttendanceList = teacherAttendanceMap.get(courseScheduleId);
|
|
|
|
|
|
- List<Integer> oldTeacherIdList = teacherAttendanceList.stream().map(TeacherAttendance::getTeacherId).distinct().collect(Collectors.toList());
|
|
|
- List<Integer> newTeacherIdList = new ArrayList<>();
|
|
|
+ List<Integer> oldTeacherIdList = new ArrayList<Integer>();
|
|
|
+ if(teacherAttendanceList != null){
|
|
|
+ oldTeacherIdList = teacherAttendanceList.stream().map(TeacherAttendance::getTeacherId).distinct().collect(Collectors.toList());
|
|
|
+ }
|
|
|
+ List<Integer> newTeacherIdList = new ArrayList<>();
|
|
|
newTeacherIdList.addAll(newCourseSchedule.getTeachingTeacherIdList());
|
|
|
newTeacherIdList.add(newCourseSchedule.getActualTeacherId());
|
|
|
|