|
@@ -172,13 +172,13 @@
|
|
AND a.classifyID = #{classifyID}
|
|
AND a.classifyID = #{classifyID}
|
|
</if>
|
|
</if>
|
|
<if test="preferredProduct != null and preferredProduct != ''">
|
|
<if test="preferredProduct != null and preferredProduct != ''">
|
|
- AND a.preferredProduct != #{preferredProduct}
|
|
|
|
|
|
+ AND IFNULL(a.preferredProduct,'') != #{preferredProduct}
|
|
</if>
|
|
</if>
|
|
<if test="commonlyProduct != null and commonlyProduct != ''">
|
|
<if test="commonlyProduct != null and commonlyProduct != ''">
|
|
- AND a.commonlyProduct != #{commonlyProduct}
|
|
|
|
|
|
+ AND IFNULL(a.commonlyProduct,'') != #{commonlyProduct}
|
|
</if>
|
|
</if>
|
|
<if test="preferentialProduct != null and preferentialProduct != ''">
|
|
<if test="preferentialProduct != null and preferentialProduct != ''">
|
|
- AND a.preferentialProduct != #{preferentialProduct}
|
|
|
|
|
|
+ AND IFNULL(a.preferentialProduct,'') != #{preferentialProduct}
|
|
</if>
|
|
</if>
|
|
<if test="productName != null and productName != ''">
|
|
<if test="productName != null and productName != ''">
|
|
AND p.name LIKE concat('%',#{productName},'%')
|
|
AND p.name LIKE concat('%',#{productName},'%')
|