|
@@ -2194,9 +2194,10 @@ public class KwfTruckService {
|
|
|
|
|
|
|
|
//车队班组
|
|
//车队班组
|
|
|
KwfFleet fleet = findByFleetTruck(truck.getId(), LoginUserHolder.getEntId());
|
|
KwfFleet fleet = findByFleetTruck(truck.getId(), LoginUserHolder.getEntId());
|
|
|
- truckDetailResp.setFleetId(fleet.getId());
|
|
|
|
|
- truckDetailResp.setFleetName(fleet.getName());
|
|
|
|
|
-
|
|
|
|
|
|
|
+ if (fleet != null) {
|
|
|
|
|
+ truckDetailResp.setFleetId(fleet.getId());
|
|
|
|
|
+ truckDetailResp.setFleetName(fleet.getName());
|
|
|
|
|
+ }
|
|
|
//查询司机信息
|
|
//查询司机信息
|
|
|
KwfDriver driver = getDriverInfo(truck.getId(), LoginUserHolder.getEntId());
|
|
KwfDriver driver = getDriverInfo(truck.getId(), LoginUserHolder.getEntId());
|
|
|
truckDetailResp.setDriverName(driver.getName());
|
|
truckDetailResp.setDriverName(driver.getName());
|