|
|
@@ -140,7 +140,6 @@
|
|
|
<include refid="productColumns"/>
|
|
|
FROM product a
|
|
|
<include refid="productJoins"/>
|
|
|
- LEFT JOIN cm_product_activity cp on cp.productId = a.productID
|
|
|
<where>
|
|
|
|
|
|
<if test="id !=null and id !=''">
|
|
|
@@ -190,9 +189,6 @@
|
|
|
<if test="productType != null and productType !=''">
|
|
|
AND a.productType = #{productType}
|
|
|
</if>
|
|
|
- <if test='actStatus == "1"'>
|
|
|
- AND cp.delFlag = '0'
|
|
|
- </if>
|
|
|
<if test="preferredFlag != null and preferredFlag != ''and preferredFlag != 0">
|
|
|
<if test="preferredFlag/100>=1">
|
|
|
AND a.preferredFlag in (100,101,110,111)
|
