From 998825767f8465f294dd4a07314931e236e5ede7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 11 Sep 2019 10:06:34 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=9A=E5=95=86=E6=88=B7=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E4=B8=8B-=E2=80=9C=E8=8A=B1=E8=8A=B1=E7=BE=8E=E9=A3=9F?= =?UTF-8?q?=E5=BA=97=E2=80=9D=E5=95=86=E6=88=B7=E6=9C=89=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BD=86=E6=98=AF=E5=9C=A8=E5=95=86=E6=88=B7?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=B2=A1=E6=98=BE=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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