|
@@ -230,7 +230,12 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
|
|
|
Page<SensorAlarm> sensorAlarmPage = this.page(CommonPageRequest.defaultPage(), queryWrapper).setOptimizeCountSql(false);
|
|
|
stopWatch.stop();
|
|
|
|
|
|
- List<SensorAlarm> sensorAlarms = listByIds(sensorAlarmPage.getRecords().stream().map(SensorAlarm::getId).collect(Collectors.toList()));
|
|
|
+ List<SensorAlarm> sensorAlarms = new ArrayList<>();
|
|
|
+ if (sensorAlarmPage.getRecords().isEmpty()) {
|
|
|
+ return sensorAlarmPage;
|
|
|
+ } else {
|
|
|
+ sensorAlarms = listByIds(sensorAlarmPage.getRecords().stream().map(SensorAlarm::getId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
sensorAlarmPage.setRecords(sensorAlarms);
|
|
|
|
|
|
log.info(stopWatch.prettyPrint(TimeUnit.MILLISECONDS));
|