Merge remote-tracking branch 'origin/developerC' into developerC

src/main/resources/mapper/MallOrganizeMapper.xml

@@ -63,7 +63,7 @@
         LEFT JOIN cm_sku s ON p.productId = s.productId
         left join cm_organize_product_info copi on copi.productId = p.productID and copi.organizeId = 4
         <where>
-            copi.validFlag = 2
+            copi.validFlag = 2 and s.organizeId =4
             <if test="floorIds.size() > 0">
                 and cmfp.floorId in
                 <foreach collection="floorIds" item="floorId" open="(" separator="," close=")">
@@ -224,7 +224,7 @@
         FROM product p
             LEFT JOIN cm_sku s ON p.productId = s.productId
                  LEFT JOIN cm_mall_floor_product cmfp ON cmfp.productId = p.productId
-        WHERE cmfp.floorId = #{floorId}
+        WHERE  s.organizeId = 4 and cmfp.floorId = #{floorId}
     </select>
     <select id="getThemeInfo" resultType="com.caimei365.commodity.model.vo.MallThemeVo">
         SELECT id, organizeId, topic, image, enabledStatus, jumpType, jumpProductId, jumpActiveId, ADDTIME