fix: 修正查询过滤

dev
huangfeng 11 months ago
parent 7ef00b17f8
commit 8a3fa8eac9

@ -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);

@ -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);

Loading…
Cancel
Save