|
|
@@ -140,6 +140,8 @@
|
|
|
<include refid="productJoins"/>
|
|
|
LEFT JOIN cm_product_activity cp on cp.productId = a.productID
|
|
|
<where>
|
|
|
+ AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
|
|
|
+ AND a.productID NOT IN (6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
|
|
|
<if test="id !=null and id !=''">
|
|
|
AND a.productID=#{id}
|
|
|
</if>
|
|
|
@@ -226,17 +228,20 @@
|
|
|
<if test="newvalidFlag !=null and newvalidFlag!= ''">
|
|
|
AND a.newvalidFlag=#{newvalidFlag}
|
|
|
</if>
|
|
|
- <if test="newProductType !=null and newProductType!= ''">
|
|
|
+ <if test="newProductType !=null">
|
|
|
AND a.newProductType=#{newProductType}
|
|
|
</if>
|
|
|
+ <if test="newProductType ==2">
|
|
|
+ AND a.newProductType=2
|
|
|
+ or a.newProductType is null
|
|
|
+ </if>
|
|
|
<if test="contactName !=null and contactName !=''">
|
|
|
AND (cshd.contactName LIKE concat('%',#{contactName},'%') or cshd.companyName LIKE concat('%',#{contactName},'%'))
|
|
|
</if>
|
|
|
<if test="sqlMap !=null and sqlMap !=''">
|
|
|
${sqlMap.dsf}
|
|
|
</if>
|
|
|
- AND a.shopID not in (SELECT s.`value` FROM `sys_dict` s WHERE s.type='heheShopID')
|
|
|
- AND a.productID NOT IN (6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
|
|
|
+
|
|
|
</where>
|
|
|
<choose>
|
|
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
Duan_xu