Joburgess 5 лет назад
Родитель
Сommit
602f49c2be

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -131,7 +131,7 @@
 	<select id="queryPage" resultMap="VipGroupActivity" parameterType="map">
 		SELECT
 		vga.*,
-		(NOW() &lt; end_time_ AND NOW() > start_time_) enable,
+		((NOW() &lt; end_time_ AND NOW() > start_time_) OR end_time_ IS NULL) enable,
 		GROUP_CONCAT(vgc.name_) vip_group_category_names_
 		FROM vip_group_activity vga
 		LEFT JOIN vip_group_category vgc ON FIND_IN_SET(vgc.id_,vga.vip_group_category_id_list_)
@@ -153,7 +153,7 @@
 			vip_group_activity
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
-			AND NOW() &lt; end_time_
+			AND (NOW() &lt; end_time_ OR end_time_ IS NULL)
 			AND del_flag_=0
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">