|
|
@@ -141,7 +141,7 @@ |
|
|
<if test="id!=null"> |
|
|
<if test="id!=null"> |
|
|
and pso.id =#{id} |
|
|
and pso.id =#{id} |
|
|
</if> |
|
|
</if> |
|
|
<if test="merchantName!=null"> |
|
|
|
|
|
|
|
|
<if test="merchantName!=null and ''!=merchantName"> |
|
|
and m.`name` like concat('%',#{merchantName},'%') |
|
|
and m.`name` like concat('%',#{merchantName},'%') |
|
|
</if> |
|
|
</if> |
|
|
<if test="startdate!=null and enddate!=null"> |
|
|
<if test="startdate!=null and enddate!=null"> |
|
|
|