diff --git a/web/src/main/java/com/zhehekeji/web/service/StockLogService.java b/web/src/main/java/com/zhehekeji/web/service/StockLogService.java
index 0c0e1f4..0cc8101 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockLogService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/StockLogService.java
@@ -28,7 +28,9 @@ public class StockLogService {
 
         if(search.getStreetId() != null){
             Street street = streetService.streetById(search.getStreetId());
-            shelveIds = streetService.getShelves(street,search.getLeftRight(),search.getSide());
+            if(street != null){
+                shelveIds = streetService.getShelves(street,search.getLeftRight(),search.getSide());
+            }
         }
 
         PageHelper.startPage(search.getPageNum(),search.getPageSize());