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<>();