diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java
index b262b844e..37f14a024 100644
--- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java
+++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java
@@ -27,6 +27,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -65,6 +66,9 @@ public class LogManageServiceImpl implements LogManageService {
             if (!CollectionUtils.isEmpty(pageLogs)) {
                 for (TerminalLogs logs: pageLogs) {
                     DeviceLogVO deviceLogVO = logManageMapper.getDeviceLogData(logs.getLineId(), logs.getTerminalType(), logs.getUpdateBy());
+                    if (Objects.isNull(deviceLogVO)) {
+                        continue;
+                    }
                     LocalDateTime localDateTime = LocalDateTime.ofInstant(logs.getTimeId(), ZoneId.systemDefault());
                     DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
                     String time = dateTimeFormatter.format(localDateTime);
@@ -72,9 +76,9 @@ public class LogManageServiceImpl implements LogManageService {
                     deviceLogVO.setRemark(logs.getTerminalDescribe());
                     logData.add(deviceLogVO);
                 }
-                //当前页数据
-                page.setRecords(logData);
             }
+            //当前页数据
+            page.setRecords(logData);
         }
         return page;
     }
@@ -102,13 +106,16 @@ public class LogManageServiceImpl implements LogManageService {
                 for (EventPushLogs pushLogs: eventPushLogs) {
                     for (EventDetail eventDetail: eventDetailData) {
                         if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getTimeId())) {
+                            EventLogVO event = logManageMapper.getEventLogData(pushLogs.getLineId());
+                            if (Objects.isNull(event)) {
+                                continue;
+                            }
                             EventLogVO eventLogVO = new EventLogVO();
                             eventLogVO.setLineId(pushLogs.getLineId());
                             LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault());
                             DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
                             String format = dateTimeFormatter.format(localDateTime);
                             eventLogVO.setTime(format);
-                            EventLogVO event = logManageMapper.getEventLogData(eventLogVO.getLineId());
                             eventLogVO.setLine(event.getLine());
                             eventLogVO.setSubstation(event.getSubstation());
                             eventLogVO.setPowerCompany(event.getPowerCompany());
@@ -131,13 +138,12 @@ public class LogManageServiceImpl implements LogManageService {
                             eventLogVO.setUpdateTime(pushLogs.getUpdateTime());
 
                             list.add(eventLogVO);
-                            //当前页数据
-                            page.setRecords(list);
                         }
                     }
                 }
             }
-
+            //当前页数据
+            page.setRecords(list);
         }
         return page;
     }