diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java
index bca70eb7f..c57e17a78 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java
@@ -56,13 +56,13 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService {
 					String[] endWarehouseIds = lineInfoVO.getEndWarehouseIds().split(",");
 					Long endWarehouseId = Long.valueOf(endWarehouseIds[endWarehouseIds.length - 1]);
 					WarehouseInfoVO warehouseInfo = warehouseInfoMap.get(endWarehouseId);
-
-					targetWarehouse.setWarehouseId(endWarehouseId);
-					targetWarehouse.setWarehouseName(warehouseInfo.getWarehouseName());
-					targetWarehouse.setLat(warehouseInfo.getLat());
-					targetWarehouse.setLng(warehouseInfo.getLng());
-
-					target.add(targetWarehouse);
+					if(warehouseInfo!=null){
+						targetWarehouse.setWarehouseId(endWarehouseId);
+						targetWarehouse.setWarehouseName(warehouseInfo.getWarehouseName());
+						targetWarehouse.setLat(warehouseInfo.getLat());
+						targetWarehouse.setLng(warehouseInfo.getLng());
+						target.add(targetWarehouse);
+					}
 				});
 				mapWarehouseVO.setTarget(target);