Merge branch 'dev' into lb_dev

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

@@ -172,10 +172,14 @@ public class VehicleActiveService {
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
         if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-            stringBuilder.append("中，使用人：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-            stringBuilder.append(" 使用人电话：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+            if(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());
+            } else { //没有出车记录
+                stringBuilder.append(" 请联系管理员修改车辆状态为正常运行！");
+            }
         }
         return stringBuilder.toString();
     }