Browse Source

Merge branch 'master_saas' of http://git.dayaedu.com/yonge/mec into master_saas

yonge 2 năm trước cách đây
mục cha
commit
2337f16238

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

@@ -6591,6 +6591,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 						int size = beforeCourse.size();
 						collect = beforeCourse.subList(size - 2, size).stream()
+                                .filter(o -> CourseStatusEnum.NOT_START.equals(o.getStatus()))
 								.map(CourseSchedule::getId)
 								.distinct().collect(Collectors.toList());
 						if (CollectionUtils.isNotEmpty(collect)) {
@@ -6601,7 +6602,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 					// 课程后连堂状态
 					if (afterCourse.get(0).getContinuousCourse()) {
-						collect = afterCourse.stream().map(CourseSchedule::getId).distinct().collect(Collectors.toList());
+						collect = afterCourse.stream()
+                                .filter(o -> CourseStatusEnum.NOT_START.equals(o.getStatus()))
+                                .map(CourseSchedule::getId).distinct().collect(Collectors.toList());
 
 						if (CollectionUtils.isNotEmpty(collect)) {
 							// 关联直播间编号