|
|
|
@@ -81,13 +81,12 @@ |
|
|
|
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> |
|
|
|
<if test=" null != merchantName and ''!=merchantName ">and m.`name` like concat('%',#{merchantName},'%') |
|
|
|
</if> |
|
|
|
<if test=" null != tenantId ">and br.`tenant_id` = #{tenantId}</if> |
|
|
|
<if test=" null != status ">and br.`status` = #{status}</if> |
|
|
|
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if> |
|
|
|
<if test=" null != name ">and br.`name` = #{name}</if> |
|
|
|
<if test=" null != name and ''!=name">and br.`name` = #{name}</if> |
|
|
|
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> |
|
|
|
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> |
|
|
|
<if test=" null != comments ">and br.`comments` like concat('%',#{comments},'%')</if> |
|
|
|
<if test=" null != comments and ''!=comments">and br.`comments` like concat('%',#{comments},'%')</if> |
|
|
|
|
|
|
|
</where> |
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
|
|