修改车辆轨迹查询

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfFleetRepository.java

@@ -22,9 +22,10 @@ import java.util.Set;
 @Repository
 public class KwfFleetRepository extends ServiceImpl<KwfFleetMapper, KwfFleet> {
 
-    public KwfFleet queryByName(String fleetName) {
+    public KwfFleet queryByEntIdAndName(Long entId,String fleetName) {
         return getOne(Wrappers.<KwfFleet>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
+                .eq(Objects.nonNull(entId),KwfFleet::getEntId, entId)
                 .like(StringUtils.isNotBlank(fleetName),KwfFleet::getName, fleetName)
                 .orderByDesc(BaseModel::getId)
                 .last("limit 1"));

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

@@ -1349,10 +1349,10 @@ public class KwfTruckService {
         //查询车队
         List<KwfFleet> kwfFleets = Lists.newArrayList();
         if (StringUtils.isNotBlank(req.getFleetName())){
-            KwfFleet fleet = kwfFleetRepository.queryByName(req.getFleetName());
+            KwfFleet fleet = kwfFleetRepository.queryByEntIdAndName(req.getEntId() ,req.getFleetName());
             kwfFleets.add(fleet);
         }else {
-            kwfFleets = kwfFleetRepository.findAll();
+            kwfFleets = kwfFleetRepository.findFleetByEntId(req.getEntId());
         }
         if (CollectionUtils.isEmpty(kwfFleets)){
             return new CapacityStatusVo();