diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 4f48be03a..7e3b4081f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -2306,22 +2306,31 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl omaList = this.getListByVdrList(vdrList); for (OtaManagePermission omp : ompList) { + if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getReleaseName()) && !omp.getApplyId().contains(otaManageReceiveNsdp.getReleaseName())) { + continue; + } String vehicleStr = omp.getVehicle(); String[] vehicleList = vehicleStr.split(","); for (String vehicle : vehicleList) { + if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getVehicle()) && !vehicle.contains(otaManageReceiveNsdp.getVehicle())) { + continue; + } List omrVehicleList = omrList.stream() .filter(obj -> StringUtils.isNotEmpty(obj.getPlannedBpLaunchBatch()) && obj.getPlannedBpLaunchBatch().equals(omp.getApplyId()) && StringUtils.isNotEmpty(obj.getVehicleMatch()) && obj.getVehicleMatch().contains(vehicle)) .collect(Collectors.toList()); for (OtaManageReceive mrVehicle : omrVehicleList) { + if (StringUtils.isNotEmpty(otaManageReceiveNsdp.getReleaseType()) && !otaManageReceiveNsdp.getReleaseType().equals(mrVehicle.getReleaseType())) { + continue; + } if (!OtaHomoImpactEnum.YES.getValue().equals(mrVehicle.getHomologationImpact()) && !OtaHomoImpactEnum.INTER_VALID.getValue().equals(mrVehicle.getHomologationImpact())) { List applyList = omaList.stream() .filter(obj -> StringUtils.isNotEmpty(obj.getVdr()) && obj.getVdr().equals(mrVehicle.getId()) && StringUtils.isNotEmpty(obj.getVehicleType()) && obj.getVehicleType().equals(vehicle)) .collect(Collectors.toList()); - if(CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())){ + if (CollectionUtils.isEmpty(applyList) || OtaStatusEnum.TO_BE_MATCHED.getKey().equals(applyList.get(0).getMatchStatus())) { OtaManageReceiveNsdp omrn = new OtaManageReceiveNsdp(); omrn.setId(UUID.randomUUID().toString().replace("-", "")); omrn.setReleaseName(omp.getApplyId());