From db118ee8c1dfb5639ce07007df6bb2f368eb934e Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Sun, 25 Jun 2023 15:11:09 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=90=88=E5=B9=B6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/OrderInfoServiceImpl.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
index ffd75f2c..6b48684f 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@@ -2027,13 +2027,14 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         }
         List<OrderItemInfo> collect = null;
         if(itemList != null){
-            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isBlank(t.getSpbm())).collect(Collectors.toList());
+            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList());
             if(ObjectUtil.isNull(collect)){
                 return R.error("税收编码为空的不允许合并，请先更新税收编码");
             }
         }else{
             collect = orderItemInfos;
         }
+        log.debug("合并分组前{}",JSONObject.toJSONString(collect));
         Map<String, List<OrderItemInfo>> collect1 = collect.stream().map(t->{
             t.setXmmc(StringUtils.isBlank(t.getXmmc())?"":t.getXmmc());
             t.setXmdw(StringUtils.isBlank(t.getXmdw())?"":t.getXmdw());