|
|
|
@@ -441,7 +441,7 @@ |
|
|
|
<if test="tenantId!=null"> |
|
|
|
and o.tenant_id =#{tenantId} |
|
|
|
</if> |
|
|
|
<if test="merchantName!=null"> |
|
|
|
<if test="merchantName!=null and merchantName!=''"> |
|
|
|
and o.`merchant_name` like concat('%',#{merchantName},'%') |
|
|
|
</if> |
|
|
|
<if test="startdate!=null and enddate!=null"> |
|
|
|
|