From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index 3ebfebd..2757940 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/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);
--
Gitblit v1.7.1