From c5cc9c31509e04e95f3848a9dc5e2e9aedebb417 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 15 Apr 2019 19:48:04 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][ID1001254][dev=20version:.878.1297?= =?UTF-8?q?=EF=BC=9A=E5=A4=9A=E7=BB=8F=E7=82=B9=E4=BD=8D-=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E7=82=B9=E4=BD=8D=E5=95=86=E6=88=B7=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E8=A1=A5=E5=BD=95=E4=B8=8B=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 9f3db8b5f..123e45815 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -455,10 +455,10 @@ and s.`status` = #{status} - + and s.id not in( - SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,5,6,7) and - merchant_id is not null + SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status not in(0,5,6,7) + merchant_id is not null and rent_shop_type=2 )