|
|
@@ -106,7 +106,6 @@ |
|
|
<if test=" null != id ">and br.`id` = #{id}</if> |
|
|
<if test=" null != id ">and br.`id` = #{id}</if> |
|
|
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> |
|
|
<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 != 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 != status ">and br.`status` = #{status}</if> |
|
|
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if> |
|
|
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if> |
|
|
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if> |
|
|
<if test=" null != starttime and null!=endtime ">and br.`receive_date` between #{starttime} and #{endtime}</if> |
|
|
|