|
@@ -130,7 +130,7 @@
|
|
|
left join cm_organize_product_info copi on copi.productId = a.productID
|
|
left join cm_organize_product_info copi on copi.productId = a.productID
|
|
|
left join shop s on a.shopId = s.shopID
|
|
left join shop s on a.shopId = s.shopID
|
|
|
<where>
|
|
<where>
|
|
|
-
|
|
|
|
|
|
|
+ copi.validFlag in (2,3,9)
|
|
|
<if test="productID !=null and productID !=''">
|
|
<if test="productID !=null and productID !=''">
|
|
|
AND a.productID=#{productID}
|
|
AND a.productID=#{productID}
|
|
|
</if>
|
|
</if>
|
|
@@ -146,8 +146,6 @@
|
|
|
<if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
|
|
<if test="dbName == 'mssql'">'%'+#{shopName}+'%'</if>
|
|
|
<if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
|
|
<if test="dbName == 'mysql'">concat('%',#{shopName},'%')</if>
|
|
|
</if>
|
|
</if>
|
|
|
--- AND a.validFlag in (2,3,9)
|
|
|
|
|
- copi.validFlag in (2,3,9)
|
|
|
|
|
and a.combinationID is null
|
|
and a.combinationID is null
|
|
|
and a.productCategory = 1
|
|
and a.productCategory = 1
|
|
|
</where>
|
|
</where>
|
zhijiezhao