renyu преди 2 години
родител
ревизия
e95385472b
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      src/main/java/com/chinaitop/depot/grainAnalysis/controller/GrainAnalysisController.java

+ 3 - 1
src/main/java/com/chinaitop/depot/grainAnalysis/controller/GrainAnalysisController.java

@@ -285,7 +285,9 @@ public class GrainAnalysisController {
285
 				List<GrainAnalysis> grainAnalysisList = grainAnalysisService.getMonthAnalysis(grainAnalysis.getHouseId(), grainAnalysis.getJcnf(), grainAnalysis.getJcjd(), grainAnalysis.getOrgId());
285
 				List<GrainAnalysis> grainAnalysisList = grainAnalysisService.getMonthAnalysis(grainAnalysis.getHouseId(), grainAnalysis.getJcnf(), grainAnalysis.getJcjd(), grainAnalysis.getOrgId());
286
 				if(!CollectionUtils.isEmpty(grainAnalysisList) && !CollectionUtils.isEmpty(grainAnalysisAbnormalList)){
286
 				if(!CollectionUtils.isEmpty(grainAnalysisList) && !CollectionUtils.isEmpty(grainAnalysisAbnormalList)){
287
 					for (GrainAnalysis analysis : grainAnalysisList) {
287
 					for (GrainAnalysis analysis : grainAnalysisList) {
288
-						onlyDatas.addAll(analysis.gettTestdata());
288
+						if(analysis.gettTestdata()!=null){
289
+							onlyDatas.addAll(analysis.gettTestdata());
290
+						}
289
 					}
291
 					}
290
 				}
292
 				}
291
 				grainAnalysis.settTestdata(onlyDatas);
293
 				grainAnalysis.settTestdata(onlyDatas);