From 3345486631d34f1202ec904926d8308a28dd1673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= <gaoronglin@ele-cloud.com>
Date: Tue, 19 Sep 2023 15:21:19 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E5=90=8C=E6=AD=A5=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderProcessServiceImpl.java   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
index 52ff8b0a..41d3457d 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java
@@ -82,9 +82,14 @@ public class OrderProcessServiceImpl implements OrderProcessService {
         log.debug("订单查询，当前页：{},页面条数:{}", currPage, pageSize);
         PageHelper.startPage(currPage, pageSize);
         List<OrderProcessInfo> list = orderProcessInfoMapper.queryOrderInfo(paramMap, shList, entList);
-        List<DeptEntity> taxpayerEntityList = userInfoService.getTaxpayerEntityList();
-        Map<String, String> collect = taxpayerEntityList.stream().collect(Collectors.toMap(t -> t.getDeptId(), t -> t.getName()));
-        list.forEach(op -> {
+        Map<String, String> collect = null;
+        try {
+            List<DeptEntity> taxpayerEntityList = userInfoService.getTaxpayerEntityList();
+            collect = taxpayerEntityList.stream().collect(Collectors.toMap(t -> t.getDeptId(), t -> t.getName()));
+        } catch (Exception e) {
+            log.error("订单查询异常{}",e.getMessage());
+        }
+        for (OrderProcessInfo op : list) {
             //如果是红票，将清单标志改为0，（红票没有清单）
             if (OrderInfoEnum.ORDER_BILLING_INVOICE_TYPE_1.getKey().equals(op.getKplx())) {
                 op.setQdbz("0");
@@ -93,8 +98,10 @@ public class OrderProcessServiceImpl implements OrderProcessService {
             if (Objects.isNull(op.getDyztms())) {
                 op.setDyztms("");
             }
-            op.setTaxpayerName(StringUtils.isNotBlank(collect.get(op.getEntId()))?collect.get(op.getEntId()):"");
-        });
+            if(collect != null){
+                op.setTaxpayerName(StringUtils.isNotBlank(collect.get(op.getEntId()))?collect.get(op.getEntId()):"");
+            }
+        }
         PageInfo<OrderProcessInfo> pageInfo = new PageInfo<>(list);
         return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(),
                 pageInfo.getPageNum());