From a09edb694f591ad25c0e7c0c3d41bf05c5bf80ac Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 3 Jul 2024 18:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E6=8F=90BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockArticleServiceImpl.java       | 2 +-
 .../service/impl/DistrilbutionBillLadingServiceImpl.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index e9033bfc4..0b5633a4b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -2611,7 +2611,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		List<Long> collect = null;
 
-		if(ObjectUtils.isNotNull(myWarehouseList)){
+		if(ObjectUtils.isNotNull(currentWarehouse)){
 			collect = new ArrayList<>();
 			collect.add(currentWarehouse.getId());
 		}else{
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index de3e1f391..a21ce97cc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -453,7 +453,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					.eq(DistributionDeliveryDetailsEntity::getBillLadingId, distrilbutionBillLading.getId())
 					.ne(DistributionDeliveryDetailsEntity::getInventoryStatus, "2")
 				);
-				Map<Long, List<DistributionDeliveryDetailsEntity>> map = null;
+				Map<Long, List<DistributionDeliveryDetailsEntity>> map = new HashMap<>();
 				if (!listDetails.isEmpty()) {
 					map = listDetails.stream().collect(Collectors.groupingBy(DistributionDeliveryDetailsEntity::getStockListId));
 				}