|
@@ -5140,13 +5140,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
actualTeacherIds.addAll(courseSchedules.stream().map(e -> e.getOperatorId()).collect(Collectors.toSet()));
|
|
|
Set<Integer> schoolIds = courseSchedules.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());
|
|
|
Map<Integer, String> actualTeacherMap = getMap("sys_user", "id_", "real_name_", actualTeacherIds, Integer.class, String.class);
|
|
|
- Map<Integer, String> schoolMap = getMap("school", "id_", "name_", schoolIds, Integer.class, String.class);
|
|
|
- courseSchedules.forEach(e->{
|
|
|
+ Map<Integer, String> schoolMap = new HashMap<>();
|
|
|
+ if(schoolIds != null && schoolIds.size() > 0){
|
|
|
+ schoolMap = getMap("school", "id_", "name_", schoolIds, Integer.class, String.class);
|
|
|
+ }
|
|
|
+ for (CourseScheduleAuditDetailDto e : courseSchedules) {
|
|
|
e.setTeacherName(actualTeacherMap.get(e.getTeacherId()));
|
|
|
e.setActualTeacherName(actualTeacherMap.get(e.getActualTeacherId()));
|
|
|
e.setSchoolName(schoolMap.get(e.getSchoolId()));
|
|
|
e.setOperatorName(actualTeacherMap.get(e.getOperatorId()));
|
|
|
- });
|
|
|
+ }
|
|
|
return courseSchedules;
|
|
|
}
|
|
|
return null;
|