From ef0fe2fa7af0eaf8d25f571f86135e2e56490f28 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 19 Jul 2024 20:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=A7=BB=E9=99=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95BUg=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistrilbutionBillStockServiceImpl.java      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java
index 8060e7de2..1a3b4cc74 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java
@@ -295,9 +295,6 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			return false;
 		}
 
-
-
-
 		//此订单存在扫描记录既无法进行取消操作
 		List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 			.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
@@ -307,7 +304,7 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			//判断是否存在别人在进行签收操作
 			List<Long> a = redis.get("warehouseId:" + myCurrentWarehouse.getId() + "pickupBatch:" + billLadingEntity.getPickupBatch() + "orderPackageCode:");
 			List<Long> packageIds = ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toList());
-			if (!packageIds.isEmpty() && !a.isEmpty()) {
+			if (!packageIds.isEmpty() && ObjectUtils.isNotNull(a)) {
 				boolean flag = a.stream().anyMatch(any -> packageIds.contains(any));
 				if (flag){
 					List<Long> ids = a.stream().filter(f -> packageIds.contains(f)).collect(Collectors.toList());