|
@@ -1494,7 +1494,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
}else{
|
|
}else{
|
|
csStudentIds = courseStudentIdsMap.get(cs.getId());
|
|
csStudentIds = courseStudentIdsMap.get(cs.getId());
|
|
}
|
|
}
|
|
- repeatStudentIds = csStudentIds.stream().filter(id -> currentCourseStudentIds.contains(id)).collect(Collectors.toSet());
|
|
|
|
|
|
+ if(null!=csStudentIds){
|
|
|
|
+ repeatStudentIds = csStudentIds.stream().filter(id -> currentCourseStudentIds.contains(id)).collect(Collectors.toSet());
|
|
|
|
+ }
|
|
|
|
|
|
Set<Integer> csTeacherIds = courseTeacherIdsMap.get(cs.getId());
|
|
Set<Integer> csTeacherIds = courseTeacherIdsMap.get(cs.getId());
|
|
Set<Integer> repeatTeacherIds = new HashSet<>();
|
|
Set<Integer> repeatTeacherIds = new HashSet<>();
|
|
@@ -1522,7 +1524,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
}else{
|
|
}else{
|
|
csStudentIds = courseStudentIdsMap.get(cs.getId());
|
|
csStudentIds = courseStudentIdsMap.get(cs.getId());
|
|
}
|
|
}
|
|
- repeatStudentIds = csStudentIds.stream().filter(id -> currentCourseStudentIds.contains(id)).collect(Collectors.toSet());
|
|
|
|
|
|
+ if(null!=csStudentIds){
|
|
|
|
+ repeatStudentIds = csStudentIds.stream().filter(id -> currentCourseStudentIds.contains(id)).collect(Collectors.toSet());
|
|
|
|
+ }
|
|
|
|
|
|
Set<Integer> csTeacherIds = courseTeacherIdsMap.get(cs.getId());
|
|
Set<Integer> csTeacherIds = courseTeacherIdsMap.get(cs.getId());
|
|
Set<Integer> repeatTeacherIds = new HashSet<>();
|
|
Set<Integer> repeatTeacherIds = new HashSet<>();
|