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},'%')