Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/ProductMapper.xml

@@ -37,7 +37,7 @@
         cop.clubTaxPoint
         from cm_organize_product cop
         left join product p on cop.productId = p.productID
-        where cop.organizeId = #{organizeId} and cop.delFlag = 0
+        where cop.organizeId = #{organizeId} and cop.delFlag = 0 and cop.status = 1
         <if test="productName != null and productName != ''">
             and p.name like concat('%',#{productName},'%')
         </if>