diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
index 1e9a44e..35e21c5 100644
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java
@@ -31,7 +31,7 @@ public class EquipmentRecordServiceImpl extends ServiceImpl<EquipmentRecordMappe
         List<EquipmentRecord> list = baseMapper.selectPageRel(page, param);
 
         //计算换电记录中的设备使用时间，这里的数量不多，可以在每次查询过程中计算
-        if (!list.isEmpty() && param.getUserId()!=0 && param.getOrderId()!=0) {//如果是换电记录中的查询
+        if (null!=list && !list.isEmpty() && (param.getUserId()!=null && param.getUserId()!=0) && (param.getOrderId()!=null && param.getOrderId()!=0)) {//如果是换电记录中的查询
             if (list.size() == 1){//如果记录只有一条
                 EquipmentRecord equipmentRecord = list.get(0);
                 LocalDateTime startTime = LocalDateUtil.date2LocalDateTime(equipmentRecord.getCreateTime());