|
|
|
@@ -546,10 +546,10 @@ |
|
|
|
<if test="merchantName!=null and merchantName!=''"> |
|
|
|
and o.`merchant_name` like concat('%',#{merchantName},'%') |
|
|
|
</if> |
|
|
|
<if test="payment!=null and payment=0"> |
|
|
|
<if test="payment!=null and (payment== '' or payment == 0)"> |
|
|
|
and o.`payment` = 0 |
|
|
|
</if> |
|
|
|
<if test="payment!=null and payment>0"> |
|
|
|
<if test="payment!=null and payment > 0"> |
|
|
|
and o.`payment` > 0 |
|
|
|
</if> |
|
|
|
|
|
|
|
|