[商户][修改][是否创建合同]

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<WxRentContract> rentContractList = wxRentContractMapper.findList(rc);
             if(CollectionUtils.isEmpty(rentContractList)){
                 merchant.setHasContract(EnumHasContract.NO.getCode());