Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -3572,13 +3572,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 					// 查询最新课程信息
 					CourseSchedule newCourseSchedule = courseScheduleDao.get(item.getId());
-					// 直播课关联直播间编号
-					String liveRoomId = item.getLiveRoomId();
-
 					if (newCourseSchedule.getClassDate().getTime() > item.getClassDate().getTime()) {
 						newCourseSchedule = item;
-					} else {
-						liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
+					}
+					// 直播课关联直播间编号
+					String liveRoomId = getCourseScheduleLiveRoomId(newCourseSchedule, continueCourseTime, Lists.newArrayList(), Lists.newArrayList());
+
+					if (StringUtils.isBlank(liveRoomId)) {
+						liveRoomId = item.getLiveRoomId();
 					}
 
 					ImLiveBroadcastRoom liveRoom = imLiveBroadcastRoomService.getByRoomUid(liveRoomId);