فهرست منبع

Merge branch 'dev_20260131' of https://git.sckaiwu.cn/kaiwu-rep/sckw-service-platform into dev_20260131

chenxiaofei 1 ماه پیش
والد
کامیت
d8696ec72d
1فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 4 3
      sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

+ 4 - 3
sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -2194,9 +2194,10 @@ public class KwfTruckService {
 
         //车队班组
         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());
         truckDetailResp.setDriverName(driver.getName());