From 0c417cebec043bb568f6f731edfb4c3f8659e40e Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 28 Oct 2024 10:22:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E7=9A=84=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index b118e7413..4dbcb5f3a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -477,7 +477,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String warehouseAddress = "";
 		if (CollUtil.isNotEmpty(brands)) {
 			// 按品牌分组
-			Map<String, List<LoadScanBrandDTO>> brandMap = brands.stream().collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand));
+			Map<String, List<LoadScanBrandDTO>> brandMap = brands.stream().filter(b -> StringUtil.isNotBlank(b.getBrand())).collect(Collectors.groupingBy(LoadScanBrandDTO::getBrand));
 			for (Map.Entry<String, List<LoadScanBrandDTO>> entry : brandMap.entrySet()) {
 				List<LoadScanBrandDTO> value = entry.getValue();
 				LoadScanBrandDTO brand = value.get(0);