puzhibing
2023-02-24 b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -471,18 +471,18 @@
    public Object getDriverInfo(Integer driverId){
        Map<String, Object> map = new HashMap<>();
        TDriver tDriver = tDriverService.selectById(driverId);
        TCar tCar = tCarService.selectById(tDriver.getCarId());
//        TCar tCar = tCarService.selectById(tDriver.getCarId());
        TCarBrand tCarBrand = null;
        TCarModel tCarModel = null;
        if(null != tCar){
            tCarBrand = carBrandService.selectById(tCar.getCarBrandId());
            tCarModel = carModelService.selectById(tCar.getCarModelId());
        }
//        if(null != tCar){
//            tCarBrand = carBrandService.selectById(tCar.getCarBrandId());
//            tCarModel = carModelService.selectById(tCar.getCarModelId());
//        }
        Integer[] states = new Integer[]{2, 3, 4, 5, 6, 11};
        Wrapper<TOrderTaxi> state4 = new EntityWrapper<TOrderTaxi>().in("state", states).eq("driverId", driverId).eq("isDelete", 1);
        List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(state4);
        map.put("netcarDriver", tDriver);
        map.put("netcar", tCar);
//        map.put("netcar", tCar);
        map.put("carBrand", null != tCarBrand ? tCarBrand.getName() : "");
        map.put("carModel", null != tCarModel ? tCarModel.getName() : "");
        map.put("order", tOrderTaxis);