粮情卡空指针

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -485,7 +485,7 @@
       cc.storage_org_id,
       cc.warehouse_sealing_record_id,
       cc.out_quantity,cc.design_capacity,
-      Bs.storehouse_name ,cc.basic_storehouse_id,bua.ajmc,cc.basic_unit_aisle_id,bw.warehouse_name,cc.warehouse_id,
+      Bs.storehouse_name,cc.basic_storehouse_id,bua.ajmc,cc.basic_unit_aisle_id,bw.warehouse_name,cc.warehouse_id,
       cc.storehouse_type,cflx.enumname as "storehouseTypeName",
       xz.enumname as "grainNatureName",cc.grain_nature_id,pz.enumname as "grainVarietyName",cc.grain_variety_id,
       dj.enumname as grainGradeName,cc.grain_grade_id,cd.enumname as producerName,cc.grain_area_id,

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

@@ -86,7 +86,7 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
                 //查询质检明细
                 List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(ids[i]);
                 Map<Integer, List<String>> transformedData =    cat(itm);
-                if(transformedData!=null){
+                if(businessQcQualityInspection != null &&transformedData!=null){
                     businessQcQualityInspection.setMaps(transformedData);
                 }
                 if(businessQcQualityInspection!=null){