需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -15,8 +15,7 @@ import java.util.List;
 public interface WebsitSalesRetCMapper {
 
     @SqlParser(filter = true)
-    IPage<WebsitSalesRetVO> pageV2(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds
-    ,@Param("websitId") String websitId);
+    IPage<WebsitSalesRetVO> pageV2(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 
     @SqlParser(filter = true)
     IPage<WebsitPartsRetVO> pagePartsRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitSalesRetLogic.java

@@ -70,15 +70,13 @@ public class WebsitSalesRetLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
 
         //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitSalesRetVO.class);
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, WebsitSalesRetVO.class,adminUser);
 
-        // 网点权限
-        String websitId = adminUser.getType() == 0 ? adminUser.getAdminWebsitIds().get(0) : null;
 
         IPage<WebsitSalesRetVO> websitSalesRetVOIPage = websitSalesRetCMapper.pageV2(new Page(zfireParamBean.getPageNum(),
                         zfireParamBean.getPageSize()),
                 zfireParam
-                , companyWechatIds,websitId);
+                , companyWechatIds);
 
         return websitSalesRetVOIPage;
     }

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -16,11 +16,16 @@
                 #{item}
             </foreach>
 
-
         </if>
-        <if test="websitId != null and websitId != ''">
-            AND a.websit_id = #{websitId}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
         </if>
+
         <if test="ex.orderBy == null or ex.orderBy ==''">
             order by a.create_time desc
         </if>