From b24b8d5c5094a5b59e34e5761cffbbcd289597cc Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 8 May 2024 14:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BABUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionParcelListMapper.xml | 6 ++++++
 .../service/impl/DistributionParcelListServiceImpl.java  | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index cb71fa228..2ffd15749 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -929,6 +929,12 @@
             <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">
                 and ldpl.warehouse_id = #{paramMap.warehouseId}
             </if>
+            <if test="paramMap.warehouseIds != null ">
+                and ldpl.warehouse_id IN
+                <foreach collection="paramMap.warehouseIds" item="wItem" index="index" open="(" close=")" separator=",">
+                    #{wItem}
+                </foreach>
+            </if>
             <if test="paramMap.tenantId != null and paramMap.tenantId != ''">
                 and ldpl.tenant_id = #{paramMap.tenantId}
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 7501fa694..f7030cece 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -677,7 +677,13 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		// 获取当前登录的仓库信息
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtils.isNull(myCurrentWarehouse)) {
-			throw new ServiceException("没有仓库信息！");
+			List<BasicdataWarehouseEntity> warehouseList = warehouseClient.getMyWarehouseList();
+			if (!warehouseList.isEmpty()) {
+				List<Long> warehouseIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
+				paramMap.put("warehouseIds", warehouseIds);
+			}
+		}else {
+			paramMap.put("warehouseId", myCurrentWarehouse.getId());
 		}
 		// 用户勾选数据的ids
 		Object ids = paramMap.get("ids");
@@ -687,7 +693,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		}
 
 		String tenantId = AuthUtil.getTenantId();
-		paramMap.put("warehouseId", myCurrentWarehouse.getId());
 		paramMap.put("tenantId", tenantId);
 
 		List<DistributionParcelListExcel> list = baseMapper.exportDistributionParcelList(paramMap, idArr);