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