fix: 修正查询过滤

dev
huangfeng 11 months ago
parent 7ef00b17f8
commit 8a3fa8eac9

@ -31,9 +31,11 @@ public class LeadPullsServiceImpl implements LeadPullsService {
Long start, Long end, Integer pageNum, Integer pageSize) { Long start, Long end, Integer pageNum, Integer pageSize) {
List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId); List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
List<Integer> idList = new ArrayList<>(); List<Integer> idList = new ArrayList<>();
if (lineId != null || towerId != null) {
for (Terminals terminals : terminalsList) { for (Terminals terminals : terminalsList) {
idList.add(terminals.getId()); idList.add(terminals.getId());
} }
}
if (termIdList != null) { if (termIdList != null) {
idList.addAll(termIdList); idList.addAll(termIdList);
} }

@ -29,9 +29,11 @@ public class WeatherServiceImpl implements WeatherService {
Long start, Long end, Integer pageNum, Integer pageSize) { Long start, Long end, Integer pageNum, Integer pageSize) {
List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId); List<Terminals> terminalsList = terminalService.getByLineAndTower(lineId, towerId);
List<Integer> idList = new ArrayList<>(); List<Integer> idList = new ArrayList<>();
if (lineId != null || towerId != null) {
for (Terminals terminals : terminalsList) { for (Terminals terminals : terminalsList) {
idList.add(terminals.getId()); idList.add(terminals.getId());
} }
}
if (termIdList != null) { if (termIdList != null) {
idList.addAll(termIdList); idList.addAll(termIdList);
} }

Loading…
Cancel
Save