From 7c81a8bd68aa90fc26264a71c30de6e70210a5cd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 28 Aug 2019 15:04:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxRentContractMapper.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 7dc079828..04d155c0f 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -382,6 +382,22 @@ and rc.`rent_shop_type` = #{rentShopType} and rc.`apply_status` = #{applyStatus} and rc.`operation_type` = #{operationType} + + + and rc.merchant_id in( + select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms + inner join wx_merchant m on ms.merchant_id = m.id + inner join wx_shop s on s.id=ms.shop_id + where m.tenant_id=#{tenantId} and s.is_del=0 + + and m.business_id in (${businessForRule}) + + + and s.`floor` in (${floorForRule}) + + ) + + order by ${sortColumns} order by rc.createtime desc,rc.id desc