配送导出BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -372,7 +372,7 @@
         LEFT JOIN logpm_distribution_delivery_tripartite AS lddt ON ldds.delivery_id = lddl.id AND lddt.is_deleted = 0
         <where>
            lddl.is_deleted = 0
-           <if test=" params.ids != ''">
+           <if test=" params.ids != null">
                AND lddl.id in
                <foreach collection="params.ids" item="item" index="index" open="(" separator="," close=")">
                    #{item}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -264,7 +264,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isNotEmpty(distributionDeliveryList.get("ids"))){
 			//进行勾选操作
 			List<Long> deliveryId = Func.toLongList((String) distributionDeliveryList.get("ids"));
-			distributionDeliveryList.put("ids",deliveryId);
+			if (!deliveryId.isEmpty()){
+				distributionDeliveryList.put("ids",deliveryId);
+			}
+		}else {
+			distributionDeliveryList.remove("ids");
 		}
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)){
@@ -296,8 +300,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			deliveryListExcel.setScannedNumber(dis.getScannedNumber());
 			deliveryListExcel.setSigningNumber(dis.getSigningNumber());
 			deliveryListExcel.setLoadingTeam(dis.getHandlingCrew());
-			BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(dis.getWarehouseId());
-			deliveryListExcel.setWarehouseName(entityWarehouseId.getName());
+			if (!Objects.isNull(dis.getWarehouseId())){
+				BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(dis.getWarehouseId());
+				deliveryListExcel.setWarehouseName(entityWarehouseId.getName());
+			}
 			list.add(deliveryListExcel);
 		});
 		return list;