debug

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"/>

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