|
@@ -285,7 +285,9 @@ public class GrainAnalysisController {
|
285
|
285
|
List<GrainAnalysis> grainAnalysisList = grainAnalysisService.getMonthAnalysis(grainAnalysis.getHouseId(), grainAnalysis.getJcnf(), grainAnalysis.getJcjd(), grainAnalysis.getOrgId());
|
286
|
286
|
if(!CollectionUtils.isEmpty(grainAnalysisList) && !CollectionUtils.isEmpty(grainAnalysisAbnormalList)){
|
287
|
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
|
293
|
grainAnalysis.settTestdata(onlyDatas);
|