Browse Source

Merge remote-tracking branch 'origin/master'

‘linchangsheng’ 2 weeks ago
parent
commit
703d459cef

+ 4 - 4
src/main/java/com/gree/mall/manager/commonmapper/AdminMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminDeptWebsitVO;
@@ -24,7 +24,7 @@ public interface AdminMapper {
     /**
      * 商户列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<AdminUser> mchList(IPage page,
                                    @Param("userName") String userName,
                                    @Param("nickName") String nickName,
@@ -33,7 +33,7 @@ public interface AdminMapper {
                                    @Param("status") Boolean status);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<AdminCompanyWechat> queryAdminCompanyWechat(@Param("adminUserId") String adminUserId);
 
 
@@ -44,7 +44,7 @@ public interface AdminMapper {
                                   @Param("roleId") String roleId, @Param("status")Boolean status,
                                   @Param("userName")String userName, @Param("companyWechatIds")List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<AdminDeptWebsitVO> list(Page page, @Param("ex") ZfireParamBean zfireParam);
 
     @Select({ "call batch_update_company_wechat_name("

+ 8 - 9
src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java

@@ -1,9 +1,8 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
 import com.gree.mall.manager.bean.coupon.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,28 +18,28 @@ public interface CouponDateMapper {
      * @param couponId
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     CouponDataBean data(@Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponTagBean> couponTagDetail(@Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponUserBean> couponTagUser(@Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponUserTypeBean> reissueCouponUser(@Param("companyWechatId")String companyWechatId, @Param("couponId")String couponId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CouponPageBean> pageCoupon(Page<CouponPageBean> objectPage, @Param("companyWechatIds")List<String> companyWechatIds,
                                      @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponExportBean> exportCoupon(@Param("companyWechatIds")List<String> companyWechatIds,
                                         @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CouponExportBean> exportSelfCoupon(@Param("companyWechatIds")List<String> companyWechatIds,
                                             @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 

+ 3 - 3
src/main/java/com/gree/mall/manager/commonmapper/CoustomUserCouponMapper.java

@@ -1,15 +1,15 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface CoustomUserCouponMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void decreaseLeftTimes(@Param("id") String id);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void increaseLeftTimes(@Param("id") String id);
 }

+ 11 - 8
src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsMapper.java

@@ -1,9 +1,12 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.goods.*;
+import com.gree.mall.manager.bean.goods.GoodsPackageList;
+import com.gree.mall.manager.bean.goods.GoodsSpecBean;
+import com.gree.mall.manager.bean.goods.GoodsTypeCount;
+import com.gree.mall.manager.bean.goods.GoodsVO;
 import com.gree.mall.manager.plus.entity.Goods;
 import com.gree.mall.manager.plus.entity.GoodsCategory;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
@@ -31,7 +34,7 @@ public interface CustomGoodsMapper {
      * @param status
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsSpecBean> pageList(Page<GoodsSpecBean> objectPage,
                                   @Param("flag") String flag,
                                   @Param("keyword") String keyword,
@@ -45,7 +48,7 @@ public interface CustomGoodsMapper {
                                   @Param("goodsTypes") List<String> goodsTypes,
                                   @Param("companyWechatId")String companyWechatId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsSpecBean> list(@Param("commonTemplateId") String commonTemplateId);
 
 
@@ -54,7 +57,7 @@ public interface CustomGoodsMapper {
      *
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public GoodsTypeCount countByType(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
@@ -62,7 +65,7 @@ public interface CustomGoodsMapper {
      *
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Integer countByFlag(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
@@ -70,7 +73,7 @@ public interface CustomGoodsMapper {
      *
      * @return
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Integer ysq(@Param("companyWechatIds") List<String> companyWechatIds);
 
     /**
@@ -82,7 +85,7 @@ public interface CustomGoodsMapper {
     /**
      * 查询商品分类
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public GoodsCategory queryGoodsCategoryByGoodsId(@Param("goodsId") String goodsId);
 
     /**

+ 2 - 3
src/main/java/com/gree/mall/manager/commonmapper/CustomMemberMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.coupon.CouponDataBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.member.MemberBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,7 +9,7 @@ import java.util.List;
 
 @Mapper
 public interface CustomMemberMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<MemberBean> queryUser(@Param("type")String type, @Param("keyword")String keyword,
                                @Param("websitNos")List<String> websitNos, @Param("startTime")String startTime,
                                @Param("endTime")String endTime, @Param("companyWechatIds")List<String> companyWechatIds);

+ 5 - 5
src/main/java/com/gree/mall/manager/commonmapper/CustomOfflineMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.offline.WebsitBean;
 import com.gree.mall.manager.bean.offline.ZoneBean;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,13 +10,13 @@ import java.util.List;
 
 @Mapper
 public interface CustomOfflineMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<ZoneBean> queryZoneList(@Param("adminUserId")String adminUserId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitBean> queryWebsitList(@Param("adminUserId")String adminUserId);
-     @SqlParser(filter = true)
+     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<ZoneBean> queryZoneAllList();
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitBean> queryWebsitAllList();
 
 }

+ 2 - 4
src/main/java/com/gree/mall/manager/commonmapper/CustomSalesReportMapper.java

@@ -1,17 +1,15 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.member.MemberBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.plus.entity.SaleReport;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface CustomSalesReportMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<SaleReport> queryData(@Param("websitNumbers") List<String> websitNumbers,
                                @Param("startTime") String startTime,
                                @Param("endTime") String endTime,

+ 2 - 2
src/main/java/com/gree/mall/manager/commonmapper/CustomTagGroupMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.tag.CustomTagGroup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,6 +10,6 @@ import java.util.List;
 @Mapper
 public interface CustomTagGroupMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<CustomTagGroup> queryTagList(@Param("companyWechatIds") List<String> companyWechatIds);
 }

+ 2 - 3
src/main/java/com/gree/mall/manager/commonmapper/CustomWebsitMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.tag.CustomTagGroup;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,6 +8,6 @@ import java.util.List;
 
 @Mapper
 public interface CustomWebsitMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryById(@Param("id")String id);
 }

+ 3 - 4
src/main/java/com/gree/mall/manager/commonmapper/GoodsCheckMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.bean.activity.SecKillActivitySpecBean;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,9 +8,9 @@ import java.util.List;
 
 @Mapper
 public interface GoodsCheckMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     Integer checkGoodsSec(@Param("goodsId")String goodsId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> checkGoodsSecBatch(@Param("goodsIds")List<String> goodsIds);
 }

+ 3 - 3
src/main/java/com/gree/mall/manager/commonmapper/OrderShareReportMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.order.OrderShareReportBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,9 +10,9 @@ import java.util.List;
 @Mapper
 public interface OrderShareReportMapper {
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<OrderShareReportBean> queryReport(@Param("orderIds") List<String> orderIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<OrderShareReportBean> queryReport2(@Param("orderShareIdList") List<String> orderShareIdList);
 }

+ 6 - 9
src/main/java/com/gree/mall/manager/commonmapper/SecKillMapper.java

@@ -1,33 +1,30 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
 import com.gree.mall.manager.bean.activity.CustomSpecBean;
 import com.gree.mall.manager.bean.activity.SecKillActivitySpecBean;
 import com.gree.mall.manager.bean.activity.SecKillActivityStageBean;
-import com.gree.mall.manager.bean.goods.GoodsSpecBean;
-import io.swagger.annotations.ApiParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface SecKillMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSecSpecBean> querySecSpec(IPage page,
                                           @Param("keyword")String keyword,
                                           @Param("status") Integer status,
                                           @Param("companyWechatIds") List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<SecKillActivitySpecBean> querySecDetail(@Param("secKillId")String secKillId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<SecKillActivityStageBean> queryActivity(
             IPage page,
             @Param("status")Integer status,
@@ -36,14 +33,14 @@ public interface SecKillMapper {
             @Param("companyWechatIds") List<String> companyWechatIds);
 
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSpecBean> querySpecList(
             IPage page,
             @Param("categoryId")String categoryId,
             @Param("keyword")String keyword,
             List<String> companyWechatIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<CustomSecSpecBean> querySpecListforCoupon(Page<CustomSecSpecBean> objectPage,@Param("companyWechatIds") List<String> companyWechatIds,
                                                     @Param("categoryId")String categoryId, @Param("keyword")String keyword);
 

+ 3 - 3
src/main/java/com/gree/mall/manager/commonmapper/TaxMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.bean.tax.OrderTaxExcelBean;
 import com.gree.mall.manager.plus.entity.GoodsCategory;
 import org.apache.ibatis.annotations.Mapper;
@@ -10,10 +10,10 @@ import java.util.List;
 
 @Mapper
 public interface TaxMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     GoodsCategory queryTaxById(@Param("orderDetailId")String orderDetailId);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsCategory> queryGoodsCategoryByOrderId(@Param("orderId")String orderId);
 
     List<OrderTaxExcelBean> queryOrderTaxExcelMsg(@Param("companyWechatIds")List<String> companyWechatIds, @Param("adminWebsitIds")List<String> adminWebsitIds

+ 3 - 4
src/main/java/com/gree/mall/manager/commonmapper/WebsitMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.manager.plus.entity.GoodsCategory;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.gree.mall.manager.plus.entity.WebsitZone;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -10,8 +9,8 @@ import java.util.List;
 
 @Mapper
 public interface WebsitMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitZone> queryWebsitIds(@Param("adminUserId")String adminUserId);
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryWebsitNumbers(@Param("adminUserId")String adminUserId);
 }

+ 6 - 6
src/main/java/com/gree/mall/manager/commonmapper/WxCustomerMapper.java

@@ -1,6 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.user.UserApplyBean;
@@ -15,7 +15,7 @@ import java.util.List;
 
 @Mapper
 public interface WxCustomerMapper {
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WxCustomerBean> queryCustomerList(@Param("keyword") String keyword,
                                             @Param("startTime") Date startTime,
                                             @Param("endTime") Date endTime,
@@ -23,22 +23,22 @@ public interface WxCustomerMapper {
                                             @Param("pageNum") Integer pageNum,
                                             @Param("pageSize") Integer pageSize);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     Integer queryCustomerCount(@Param("keyword") String keyword,
                                @Param("startTime") Date startTime,
                                @Param("endTime") Date endTime,
                                @Param("tagIds") String[] tagIds);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     WxCustomerBean queryCustomerDetail(@Param("externalUserId")String externalUserId);
 
     /**
      * 查询指定企业下 与 指定标签绑定的 用户id
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<String> queryTagUserIdList(@Param("companyWechatId")String companyWechatId, @Param("couponTags")List<CouponTag> couponTags);
 
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<UserWxCustomerBean> queryCustomerByUser(@Param("workUserId")String workUserId,@Param("corpId")String corpId);
 
     IPage<UserApplyBean> queryServiceApplyList(Page<Object> objectPage,

+ 3 - 8
src/main/java/com/gree/mall/manager/commonmapper/luckdraw/LuckDrawMapper.java

@@ -1,18 +1,13 @@
 package com.gree.mall.manager.commonmapper.luckdraw;
 
-import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawCodeBean;
 import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawList;
-import com.gree.mall.manager.bean.count.CountBean;
-import com.gree.mall.manager.bean.count.CountOrderBean;
-import com.gree.mall.manager.bean.count.GoodsRankBean;
-import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface LuckDrawMapper {
@@ -21,7 +16,7 @@ public interface LuckDrawMapper {
     /**
      * 抽奖活动列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<PromotionLuckDrawList> queryList(IPage page,
                                                  @Param("name") String name,
                                                  @Param("status") Boolean status,
@@ -31,7 +26,7 @@ public interface LuckDrawMapper {
     /**
      * 兑换记录列表
      */
-    @SqlParser(filter = true)
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public IPage<PromotionLuckDrawCodeBean> queryLuckDrawCodeList(IPage page,
                                                                  @Param("promotionLuckDrawId") String promotionLuckDrawId,
                                                                  @Param("promotinLuckDrawCouponId") String promotinLuckDrawCouponId,