|
@@ -306,8 +306,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="params.companyId != null">
|
|
|
and FIND_IN_SET(#{params.companyId}, fcp.company_id)
|
|
|
</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()))
|
|
|
+ and (
|
|
|
+ (fcpd.start_date_time <= CONCAT( CURDATE(), ' 23:59:59' ) and fcpd.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))
|
|
|
+ or (ccut.start_date_time <= CONCAT( CURDATE(), ' 23:59:59' ) and ccut.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))
|
|
|
+ )
|
|
|
order by video.course_sort
|
|
|
</select>
|
|
|
<select id="selectFsUserCourseVideoByVideoIdAndUserId" resultType="com.fs.course.domain.FsUserCourseVideo">
|