From 8a3fa8eac9b343f7cb3bc8c726406c645c975e39 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 10 Jul 2024 13:46:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shxy/xymanager_service/impl/LeadPullsServiceImpl.java | 6 ++++-- .../com/shxy/xymanager_service/impl/WeatherServiceImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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 terminalsList = terminalService.getByLineAndTower(lineId, towerId); List 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 terminalsList = terminalService.getByLineAndTower(lineId, towerId); List 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);