|
@@ -1632,12 +1632,22 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
dataList.forEach(e -> {
|
|
|
e.setMixClassGroupName(classGroupNames.get(e.getMixClassGroupId()));
|
|
|
List<CourseScheduleTeacherSalary> currentBishopTeacher = courseScheduleBishopTeacherMaps.get(e.getCourseScheduleId().longValue());
|
|
|
+ List<CourseScheduleTeacherSalary> TeachingTeachers = new ArrayList<>();
|
|
|
if (!Objects.isNull(currentBishopTeacher)&&!CollectionUtils.isEmpty(currentBishopTeacher)) {
|
|
|
e.setMasterTeacherId(currentBishopTeacher.get(0).getUserId());
|
|
|
e.setMasterTeacherName(currentBishopTeacher.get(0).getUserName());
|
|
|
+ }else {
|
|
|
+ currentBishopTeacher = new ArrayList<>();
|
|
|
}
|
|
|
+ TeachingTeachers.addAll(currentBishopTeacher);
|
|
|
List<CourseScheduleTeacherSalary> currentCourseTeachingTeachers = courseScheduleTeachingTeacherMaps.get(e.getCourseScheduleId().longValue());
|
|
|
- if (CollectionUtils.isEmpty(currentCourseTeachingTeachers)&&!CollectionUtils.isEmpty(currentBishopTeacher)) {
|
|
|
+ if(Objects.isNull(currentCourseTeachingTeachers) || CollectionUtils.isEmpty(currentCourseTeachingTeachers)){
|
|
|
+ currentCourseTeachingTeachers = new ArrayList<>();
|
|
|
+ }
|
|
|
+ TeachingTeachers.addAll(currentCourseTeachingTeachers);
|
|
|
+ e.setTeachingTeachers(TeachingTeachers);
|
|
|
+ e.setTeacherNum(TeachingTeachers.size());
|
|
|
+ /*if (CollectionUtils.isEmpty(currentCourseTeachingTeachers) && !CollectionUtils.isEmpty(currentBishopTeacher)) {
|
|
|
currentCourseTeachingTeachers = new ArrayList<>();
|
|
|
if (currentBishopTeacher != null) {
|
|
|
currentCourseTeachingTeachers.add(currentBishopTeacher.get(0));
|
|
@@ -1649,12 +1659,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
currentCourseTeachingTeachers.add(currentBishopTeacher.get(0));
|
|
|
}
|
|
|
e.setTeachingTeachers(currentCourseTeachingTeachers);
|
|
|
- if(Objects.isNull(currentCourseTeachingTeachers)){
|
|
|
- e.setTeacherNum(0);
|
|
|
- }else{
|
|
|
- e.setTeacherNum(currentCourseTeachingTeachers.size());
|
|
|
- }
|
|
|
- }
|
|
|
+ }*/
|
|
|
});
|
|
|
}
|
|
|
if (count == 0) {
|