From 06c3157d6bde9f1e94e94efd72dd5ca078beabf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 30 Apr 2025 11:09:34 +0800
Subject: [PATCH] debug

---
 .../main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml  | 6 +++++-
 .../src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java  | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
index d94eb72..56ac7fc 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
@@ -373,8 +373,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bd.longitude,
             bd.latitude,
             bod.status as order_device_status,
-            bod.order_id
+            bod.order_id,
+            bm.full_voltage as model_full_voltage,
+            bm.low_voltage as model_low_voltage,
+            bm.full_endurance as model_full_endurance
         from bst_device bd
+            left join bst_model bm on bm.id = bd.model_id
             left join bst_order_device bod on bod.id = bd.order_device_id
         <where>
             <include refid="searchCondition"/>
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java b/ruoyi-service/src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java
index dbe76b1..87bce18 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/utils/OrderUtil.java
@@ -127,7 +127,8 @@ public class OrderUtil {
         BigDecimal deviceLat = device.getLatitude();
 
         // 停车区数量
-        vo.setParkingCount(parkingList.size());
+        int parkingCount = parkingList == null ? 0 : parkingList.size();
+        vo.setParkingCount(parkingCount);
 
         // 通过设备定位获取所在停车点
         AreaSubVO deviceAreaSub = AreaSubUtil.getInAreaSub(parkingList, deviceLon, deviceLat, areaError);