diff --git a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java index 1b5d8ec..6ff548f 100644 --- a/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java +++ b/ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java @@ -158,7 +158,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl featuresList = inspectionSheetFeaturesList.stream().filter(s->s.getType()==1).collect(Collectors.toList()); + List featuresList = inspectionSheetFeaturesList.stream().filter(s-> s.getSampleSize()!=null && s.getType()==1).collect(Collectors.toList()); if(featuresList != null && featuresList.size() != 0) { Integer numbersOfSamples = featuresList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize(); if (numbersOfSamples != null) { @@ -373,7 +373,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl dropNames = new ArrayList<>(); dropNames.add("transationId"); queryDataParam.setDropedTagNames(dropNames);