diff --git a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
index f9be3775..cf442855 100644
--- a/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
+++ b/src/main/java/cn/lihongjie/coal/pdcDeviceData/service/PdcDeviceDataService.java
@@ -101,13 +101,16 @@ public class PdcDeviceDataService
                 .setParameter("organizationId", Ctx.currentUser().getOrganizationId())
                 .getSingleResult();
 
-        if (minMaxTime == null) {
+        if (minMaxTime == null ) {
             return List.of();
         }
 
         LocalDateTime startTime = minMaxTime.get("minTime", LocalDateTime.class);
         LocalDateTime endTime = minMaxTime.get("maxTime", LocalDateTime.class);
 
+        if (startTime == null || endTime == null) {
+            return List.of();
+        }
 
         Query nativeQuery =
                 em.createNativeQuery(