|
@@ -16,7 +16,7 @@
|
|
|
and t1.category = #{dto.category}
|
|
|
</if>
|
|
|
<if test="dto.isEffective != null and dto.isEffective == 1">
|
|
|
- and (t1.status = 1 or t1.status = 2) and NOW() between t1.start_date and t1.end_date
|
|
|
+ and (t1.status = 1 or t1.status = 2) and enroll_end_time >= NOW()
|
|
|
</if>
|
|
|
<if test="dto.name != null and dto.name != ''">
|
|
|
and t1.name like concat('%', #{dto.name},'%')
|