From c2e65e2a205a518a85759b4bc8ba0f138f4b09f7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 13 Nov 2018 19:03:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8F=90=E5=89=8D=E7=BB=88=E6=AD=A2?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C=E4=B8=8E=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 ++- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7425a608b..664425b89 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -424,8 +424,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { //停用商户 wxMerchantService.disable(wxRentContract.getMerchantId()); //物业合同终止 - if(status.equals("1")){ + if(status==1){ WxPropertyContract wxPropertyContract = new WxPropertyContract(); + wxRentContract.setTenantId(wxRentContract.getTenantId()); wxPropertyContract.setRentContractId(id); List> contractData = wxPropertyContractMapper.queryPropertyContractData(wxPropertyContract); if(contractData.size()>0){ diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 149fbfcdc..3ea068e1c 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -93,7 +93,8 @@ left join wx_mall_floor f on s.floor=f.id left join wx_mall_building b on s.building=b.id - rc.tenant_id=#{tenantId} + rc.tenant_id=#{tenantId} + and rc.`merchant_name` like concat('%',#{merchantName},'%')