|
@@ -450,7 +450,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
|
}
|
|
}
|
|
|
List<Subject> subjects = new ArrayList<>();
|
|
List<Subject> subjects = new ArrayList<>();
|
|
|
if(!CollectionUtils.isEmpty(subjectIds)){
|
|
if(!CollectionUtils.isEmpty(subjectIds)){
|
|
|
- subjectDao.findBySubjectIds(new ArrayList<>(subjectIds));
|
|
|
|
|
|
|
+ subjects = subjectDao.findBySubjectIds(new ArrayList<>(subjectIds));
|
|
|
}
|
|
}
|
|
|
for (TeacherServeExtraDto teacherServeExtraDto : dataList) {
|
|
for (TeacherServeExtraDto teacherServeExtraDto : dataList) {
|
|
|
if(idNameMap.containsKey(teacherServeExtraDto.getUserId())){
|
|
if(idNameMap.containsKey(teacherServeExtraDto.getUserId())){
|
Joburgess