From 73ad7a9635cbb0e00767456e2ea74c494473a27a Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Tue, 20 Aug 2024 16:22:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=89=8D?=
 =?UTF-8?q?=E4=B8=96=E4=BB=8A=E7=94=9F=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/apps/service/impl/EquipmentRecordServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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