|
@@ -2365,14 +2365,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
highClassGroup.setTeacherName(bishopTeacher.getUserName());
|
|
|
highClassGroup.setUserId(bishopTeacher.getUserId());
|
|
|
CourseSchedule courseSchedule = courseScheduleDao.findOneCourseScheduleByClassGroupId(highClassGroup.getId());
|
|
|
- highClassGroup.setStartClassTime(DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm"));
|
|
|
- highClassGroup.setEndClassTime(DateUtil.format(courseSchedule.getEndClassTime(), "HH:mm"));
|
|
|
-
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.setTime(courseSchedule.getClassDate());
|
|
|
- Integer dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
|
|
- dayOfWeek = dayOfWeek.equals(0) ? 7 : dayOfWeek;
|
|
|
- highClassGroup.setDayOfWeek(dayOfWeek);
|
|
|
+ if (courseSchedule != null) {
|
|
|
+ highClassGroup.setStartClassTime(DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm"));
|
|
|
+ highClassGroup.setEndClassTime(DateUtil.format(courseSchedule.getEndClassTime(), "HH:mm"));
|
|
|
+
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ calendar.setTime(courseSchedule.getClassDate());
|
|
|
+ Integer dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK) - 1;
|
|
|
+ dayOfWeek = dayOfWeek.equals(0) ? 7 : dayOfWeek;
|
|
|
+ highClassGroup.setDayOfWeek(dayOfWeek);
|
|
|
+ }
|
|
|
}
|
|
|
return highClassGroupList;
|
|
|
}
|