diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
index e354d483..40e9b2e5 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
@@ -752,9 +752,9 @@ public class DeviceServiceImpl implements DeviceService
 
                 // 判断设备是否正在使用
                 // 设备过期时间 > 当前时间，则正在使用
-                boolean hasTime = device.getExpireTime().isAfter(now);
+                boolean hasTime =  device.getExpireTime() != null && device.getExpireTime().isAfter(now);
                 // 若当前设备有电量，则正在使用
-                boolean hasEle = data.getSurplusEle().compareTo(BigDecimal.ZERO) > 0;
+                boolean hasEle = data.getSurplusEle() != null && data.getSurplusEle().compareTo(BigDecimal.ZERO) > 0;
                 // 若开关开启，则正在使用
                 boolean hasOpen = DevicePowerStatus.ON.getStatus().equals(data.getPowerStatus());
                 if (hasTime || hasEle || hasOpen) {