| @@ -92,8 +92,8 @@ | |||||
| and o.`title` like concat('%', #{productTitle},'%') | and o.`title` like concat('%', #{productTitle},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != authorId "> | |||||
| and o.merchant_id = #{authorId} | |||||
| <if test=" null != merchantId "> | |||||
| and o.merchant_id = #{merchantId} | |||||
| </if> | </if> | ||||
| <if test=" null != author "> | <if test=" null != author "> | ||||
| @@ -185,8 +185,8 @@ | |||||
| and o.`order_status` = #{orderStatus} | and o.`order_status` = #{orderStatus} | ||||
| </if> | </if> | ||||
| <if test=" null != authorId "> | |||||
| and o.merchant_id = #{authorId} | |||||
| <if test=" null != merchantId "> | |||||
| and o.merchant_id = #{merchantId} | |||||
| </if> | </if> | ||||
| <if test=" null != author "> | <if test=" null != author "> | ||||