自提移除订单BUg修复

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());