需求

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

@@ -33,6 +33,5 @@ public interface WebsitSalesRetCMapper {
     IPage<WorkerSettlementLineVO> pageLineSettlementV2(Page page,@Param("ex") ZfireParamBean zfireParam);
 
     @SqlParser(filter = true)
-    IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds
-            ,@Param("websitId") String websitId);
+    IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
 }

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

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

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

@@ -158,9 +158,14 @@
 
 
         </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>