From ede23bb93b9965f4b6067ec960ad301ed5007d84 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 29 Aug 2019 17:13:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=AC=E7=BC=B4=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E8=81=94=E7=B3=BB=E4=BA=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index ef4f440aa..6a978ec88 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -731,12 +731,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { List listCVo = wxMerchantMapper.findListCVo(wxMerchantVo); wxMerchantVo = listCVo.get(0); result.put("merchant", wxMerchantVo.getMerchantName()); - WxShopVo wxShopVo = wxMerchantVo.getShopVoList().stream().filter(s -> StringUtils.isNotEmpty(s.getLinkPerson())).findFirst().orElse(null); + WxShopVo wxShopVo = wxMerchantVo.getShopVoList().stream() + .filter(s -> StringUtils.isNotEmpty(s.getLinkPhone()) || StringUtils.isNotEmpty(s.getLinkPerson())).findFirst().orElse(null); if (wxShopVo != null) { String linkPerson = wxShopVo.getLinkPerson(); String linkPhone = wxShopVo.getLinkPhone(); result.put("linkPerson", StringUtils.isNotEmpty(linkPerson) ? linkPerson : " "); - result.put("linkPhone", StringUtils.isNotEmpty(linkPhone) ? linkPerson : " "); + result.put("linkPhone", StringUtils.isNotEmpty(linkPhone) ? linkPhone : " "); } else { result.put("linkPerson", " "); result.put("linkPhone", " ");