|
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</if>
|
|
|
<if test="userId != null and userId != ''">
|
|
|
and (a.user_id = #{userId} or a.user_id is null)
|
|
|
- and validity_end_time >= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
|
|
|
+ and (validity_end_time >= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') or validity_end_time is null)
|
|
|
</if>
|
|
|
</where>
|
|
|
order by validity_start_time desc
|