From ad3d9fbda62da6db1286a0456f8aacdda0ca9281 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 17 Sep 2019 11:11:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=97=B6=E8=BF=87?= =?UTF-8?q?=E6=BB=A4merchantId=E4=B8=BA=E7=A9=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 704f06dce..10c0fd20f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -311,7 +311,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll) { - Map> collect = wxBillAllMapper.list(wxBillAll).parallelStream() + Map> collect = wxBillAllMapper.list(wxBillAll) + .stream().filter(b -> null != b.getMerchantId()) .collect(Collectors.groupingBy(WxBillAllVo::getMerchantId)); Set>> entries = collect.entrySet(); List datalist = new ArrayList<>();