修改绑定车辆接口

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -401,9 +401,10 @@ public class KwfDriverService {
         }
         //查询当前物流企业自动派单且生效的物流合同
         KwcContractLogisticsDto logContractByEntId = remoteContractService.findLogContractByEntId(Long.valueOf(entId));
-        if (logContractByEntId == null) {
+        if (logContractByEntId == null || logContractByEntId.getSupEntId() == null) {
             return;
         }
+
         //司机评分
         KwfDriverScore driverScoreByEntIds = driverScoreRepository.findDriverScoreByEntIds(Long.valueOf(logContractByEntId.getSupEntId()), Long.valueOf(entId), Long.valueOf(driverId));
         if (driverScoreByEntIds == null) {

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

@@ -356,7 +356,7 @@ public class KwfTruckService {
     }
 
     /**
-     * 根据企业id和车辆id查询司机信息
+     * 根据企业id和车辆id查询绑定的司机信息
      *
      * @param truck
      * @param ents
@@ -368,6 +368,7 @@ public class KwfTruckService {
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(KwfTruckReport::getTruckId, truckId)
                 .eq(KwfTruckReport::getEntId, entId)
+                .eq(KwfTruckReport::getStatus, 1)
                 .last("limit 1"));
         if (truckReport == null) {
             return new KwfDriver();