Merge remote-tracking branch 'origin/master'

cash-service/product-service/src/main/resources/mapper/ProductMapper.xml

@@ -245,11 +245,14 @@
     <select id="productList" resultType="com.czg.product.vo.ProductVO">
         select a.*, min(b.sale_price) as lowPrice
         from tb_product as a
-                 left join tb_prod_sku as b on a.id = b.product_id
+        left join tb_prod_sku as b on a.id = b.product_id
         where a.shop_id = #{shopId}
-        <foreach collection="productIds" item="id" open="(" close=")" separator=",">
-           #{id}
-        </foreach>
+        <if test="productIds != null">
+            and a.id in
+            <foreach collection="productIds" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY a.id
     </select>
     <update id="updateProductStockNum">