From 06247345d79eb0bf20e943742f73fe4544843b36 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 21 Oct 2019 17:57:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=88=9B=E5=BB=BA=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/WxMerchantServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 f57eb1b8a..0b3b6e750 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -21,7 +21,6 @@ import com.iformall.mapper.*; import com.iformall.service.*; import com.iformall.utils.DateUtils; import com.iformall.utils.EventUtil; -import jodd.util.CollectionUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -752,8 +751,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { } WxRentContract rc = new WxRentContract(); - rc.setMerchantId(record.getId()); - rc.setTenantId(record.getTenantId()); + rc.setMerchantId(merchant.getId()); + rc.setTenantId(merchant.getTenantId()); List rentContractList = wxRentContractMapper.findList(rc); if(CollectionUtils.isEmpty(rentContractList)){ merchant.setHasContract(EnumHasContract.NO.getCode());