diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java
index 62c8a39..1be3a56 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java
@@ -31,8 +31,10 @@ public class LeadPullsServiceImpl implements LeadPullsService {
                                     Long start, Long end, Integer pageNum, Integer pageSize) {
         List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
         List<Integer> idList = new ArrayList<>();
-        for (Terminals terminals : terminalsList) {
-            idList.add(terminals.getId());
+        if (lineId != null || towerId != null) {
+            for (Terminals terminals : terminalsList) {
+                idList.add(terminals.getId());
+            }
         }
         if (termIdList != null) {
             idList.addAll(termIdList);
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java
index ab27065..70cca43 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java
@@ -29,8 +29,10 @@ public class WeatherServiceImpl implements WeatherService {
                                    Long start, Long end, Integer pageNum, Integer pageSize) {
         List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
         List<Integer> idList = new ArrayList<>();
-        for (Terminals terminals : terminalsList) {
-            idList.add(terminals.getId());
+        if (lineId != null || towerId != null) {
+            for (Terminals terminals : terminalsList) {
+                idList.add(terminals.getId());
+            }
         }
         if (termIdList != null) {
             idList.addAll(termIdList);