修复活动删除后仍可以被查询问题

src/main/resources/mapper/activity/ActivityShopDao.xml

@@ -2,7 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sqx.modules.activity.dao.ActivityShopDao">
 
-
     <select id="pageShopByActivityId" resultType="com.sqx.modules.activity.vo.ActivityShopVO">
         select
             ach.id as activityShopId,
@@ -45,7 +44,8 @@
         from activity_shop ach
         left join activity a on a.id = ach.activity_id
         where
-              a.enable_flag = '1'
+              a.del_flag = '0'
+              and a.enable_flag = '1'
               and now() >= a.start_time
               and now() <![CDATA[<=]]> a.end_time
               and ach.shop_id = #{shopId}
@@ -64,7 +64,9 @@
         from activity_shop ach
         left join activity a on a.id = ach.activity_id
         where
-              ach.shop_id in
+              a.del_flag = '0'
+              and a.enable_flag = '1'
+              and ach.shop_id in
                 <foreach collection="shopIds" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>