diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index daea76026..e537dec06 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -811,12 +811,11 @@ left join wx_rent_contract rc on(rc.merchant_id = m.id) where m.status=1 ) tt where 1=1 - and tt.tenant_id = #{tenantId} and tt.id = #{merchantId} and tt.name like concat('%', #{merchantName},'%') and tt.rent_shop_type = #{rentShopType} - + and (receivePay >0 or payOut>0) order by ${sortColumns} order by tt.id desc