From 77922717be94e8cde1d24f00d5feb3126553326e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 10 Oct 2019 14:26:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=81=9C=E7=94=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index f9443024b..90b9bdcff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -263,8 +263,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { filter(c -> c.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || c.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || c.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); - //解绑商铺-没有租赁合同和物业合同才可以 - if (countRentContract == 0 && countPropertyContract == 0) { + //解绑商铺-没有租赁合同或物业合同才可以 + if (countRentContract == 0 || countPropertyContract == 0) { WxMerchantShop wxMerchantShopQuery = new WxMerchantShop(); wxMerchantShopQuery.setTenantId(wxMerchant.getTenantId()); wxMerchantShopQuery.setMerchantId(wxMerchant.getId());