123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -170,11 +170,18 @@ public class VehicleActiveService {
                 break;
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0 && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo() != null && vehicleBookRecordVos.get(0).getVehicleDepartureLogVo().getState() != 1) {
-            stringBuilder.append("中，使用人：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-            stringBuilder.append(" 使用人电话：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1 ) { //已经出车
+                    stringBuilder.append("中，使用人：");
+                    stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+                    stringBuilder.append(" 使用人电话：");
+                    stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+                    return stringBuilder.toString();
+                }
+            }
         } else {
             stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         }