|
|
@@ -517,6 +517,11 @@ |
|
|
<if test=" null != building and '' != building "> |
|
|
<if test=" null != building and '' != building "> |
|
|
and b.building_name like concat('%', #{building},'%') |
|
|
and b.building_name like concat('%', #{building},'%') |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
|
|
|
<if test=" null != merchantName and ''!=merchantName "> |
|
|
|
|
|
and m.`name` like concat('%', #{merchantName},'%') |
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
|
<if test=" null != sortColumns">order by ${sortColumns}</if> |
|
|
<if test=" null != sortColumns">order by ${sortColumns}</if> |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
|