|
@@ -377,7 +377,11 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
|
|
|
List<Integer> allTeacherIds = courseSchedules.stream().map(courseSchedule -> courseSchedule.getActualTeacherId().intValue()).collect(Collectors.toList());
|
|
|
//助教老师列表
|
|
|
List<Integer> teachingTeacherIds = new ArrayList<>();
|
|
|
- courseSchedules.forEach(courseSchedule -> teachingTeacherIds.addAll(courseSchedule.getTeachingTeacherIdList()));
|
|
|
+ courseSchedules.forEach(courseSchedule -> {
|
|
|
+ if(Objects.nonNull(courseSchedule.getTeachingTeacherIdList())){
|
|
|
+ teachingTeacherIds.addAll(courseSchedule.getTeachingTeacherIdList());
|
|
|
+ }
|
|
|
+ });
|
|
|
allTeacherIds.addAll(teachingTeacherIds);
|
|
|
//所有老师列表
|
|
|
allTeacherIds = allTeacherIds.stream().distinct().collect(Collectors.toList());
|