|  | @@ -306,9 +306,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 | 
	
		
			
				|  |  |          <if test="params.companyId != null">
 | 
	
		
			
				|  |  |              and FIND_IN_SET(#{params.companyId}, fcp.company_id)
 | 
	
		
			
				|  |  |          </if>
 | 
	
		
			
				|  |  | -        <if test="params.dayDate != null">
 | 
	
		
			
				|  |  | -            and fcpd.day_date = #{params.dayDate}
 | 
	
		
			
				|  |  | -        </if>
 | 
	
		
			
				|  |  | +        and ((fcpd.start_date_time <= CURDATE() and fcpd.end_date_time >= CURDATE())
 | 
	
		
			
				|  |  | +        or (ccut.start_date_time <= CURDATE() and ccut.end_date_time >= CURDATE()))
 | 
	
		
			
				|  |  |          order by video.course_sort
 | 
	
		
			
				|  |  |      </select>
 | 
	
		
			
				|  |  |      <select id="selectFsUserCourseVideoByVideoIdAndUserId" resultType="com.fs.course.domain.FsUserCourseVideo">
 |