粮情卡查看详情

src/main/java/com/chinaitop/depot/storage/service/impl/GrainSituationCardServiceImpl.java

@@ -69,11 +69,14 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
     @Override
     public GrainSituationCardVO detail(GrainSituationCardIdParam grainSituationCardIdParam) {
         GrainSituationCardVO grainSituationCardVO =grainSituationCardMapper.selectByGrainsituationId(grainSituationCardIdParam);
-        List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
-                grainSituationCardWarehouseRecordMapper.findByCardId(grainSituationCardIdParam);
-        if(grainSituationCardWarehouseRecordList!=null){
-            grainSituationCardVO.setGrainSituationCardWarehouseRecordList(grainSituationCardWarehouseRecordList);
+        if(grainSituationCardVO!=null){
+            List<GrainSituationCardWarehouseRecord> grainSituationCardWarehouseRecordList =
+                    grainSituationCardWarehouseRecordMapper.findByCardId(grainSituationCardIdParam);
+            if(grainSituationCardWarehouseRecordList!=null){
+                grainSituationCardVO.setGrainSituationCardWarehouseRecordList(grainSituationCardWarehouseRecordList);
+            }
         }
+
         if(grainSituationCardVO.getCheckRecordIds()!=null){
             String[] ids=grainSituationCardVO.getCheckRecordIds().split(",");
             List<BusinessQcQualityInspection> businessQcQualityInspectionList =new ArrayList<>();
@@ -83,10 +86,13 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
                 //查询质检明细
                 List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(ids[i]);
                 Map<Integer, List<String>> transformedData =    cat(itm);
+                if(transformedData!=null){
+                    businessQcQualityInspection.setMaps(transformedData);
+                }
+                if(businessQcQualityInspection!=null){
+                    businessQcQualityInspectionList.add(businessQcQualityInspection);
+                }
 
-
-                businessQcQualityInspection.setMaps(transformedData);
-                businessQcQualityInspectionList.add(businessQcQualityInspection);
             }
             if(businessQcQualityInspectionList!=null){
                 grainSituationCardVO.setBusinessQcQualityInspectionList(businessQcQualityInspectionList);