wzp
2025-05-13 81e1be286fecfc279731ced211d5315b4dfee00f
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -80,17 +80,15 @@
        if(!Objects.equals(tbVehicleOrder.getStatus(), "0"))
        {
            //非0表示订单完成了。
            try {
            TbOrders tbOrders = tbOrdersService.selectTbOrdersByOrderID(vehicleGps.getOrderId());
            if(tbOrders==null)
            {
                if (tbOrders == null) {
                return getDataTable(new ArrayList<>());
            }
            DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(tbOrders.getServiceOrdID());
            if(dispatchOrd==null)
            {
                if (dispatchOrd == null) {
                return getDataTable(new ArrayList<>());
            }
@@ -106,6 +104,12 @@
            List<VehicleGps> list = vehicleGpsService.selectVehicleGpsList(vehicleGps);
            return getDataTable(list);
        }
            catch (Exception ex)
            {
                logger.error("已完成的订单查询地图异常:{}",ex.getMessage());
                return getDataTable(new ArrayList<>());
            }
        }
        vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
        startPage();