Browse Source

fix:修复告警信息分页查询无结果时报错

黄渊昊 4 weeks ago
parent
commit
5ccdf10543

+ 6 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/SensorAlarmServiceImpl.java

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