@@ -1874,10 +1874,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
if (CollectionUtils.isEmpty(courseSchedules)) {
return false;
}
- //直播课不校验冲突
- if(courseSchedules.get(0).getGroupType() == LIVE){
- return true;
- }
List<String> classDates = courseSchedules.stream().map(courseSchedule -> DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy-MM-dd"))
.collect(Collectors.toList());
@@ -1913,7 +1913,7 @@
)
and cs.tenant_id_ = #{tenantId}
AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
- AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.group_type_ != 'LIVE'
+ AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
</select>
<select id="queryStudentCoursesTimesOfTomorrow" resultMap="Mapper">