|
@@ -197,7 +197,10 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
params.put("offset", pageInfo.getOffset());
|
|
|
dataList = studentExtracurricularExercisesSituationDao.queryTeacherServeInfo(params);
|
|
|
List<Integer> teacherIds = dataList.stream().map(TeacherServeDto::getTeacherId).collect(Collectors.toList());
|
|
|
- List<TeacherRemind> teacherReminds = teacherRemindDao.findTeachersRemindWithType(TeacherRemindTypeEnum.SERVICE, teacherIds, queryInfo.getMonday(), queryInfo.getSunday());
|
|
|
+ List<TeacherRemind> teacherReminds = new ArrayList<>();
|
|
|
+ if(!CollectionUtils.isEmpty(teacherIds)){
|
|
|
+ teacherReminds = teacherRemindDao.findTeachersRemindWithType(TeacherRemindTypeEnum.SERVICE, teacherIds, queryInfo.getMonday(), queryInfo.getSunday());
|
|
|
+ }
|
|
|
Map<String, Map<Integer, List<TeacherRemind>>> mondayTeacherRemindMap = new HashMap<>();
|
|
|
if(!CollectionUtils.isEmpty(teacherReminds)){
|
|
|
mondayTeacherRemindMap = teacherReminds.stream().collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getMonday(), "yyyy-MM-dd"), Collectors.groupingBy(TeacherRemind::getTeacherId)));
|