储备项目新-在途修改

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/utils/ExportUtil.java

@@ -168,6 +168,7 @@ public class ExportUtil {
 //                }
 //            }
             flagList.add(k);
+
         });
 
         Map<String,String> test = new HashMap<>();
@@ -176,8 +177,11 @@ public class ExportUtil {
             String key = l.getMaterialCode() + "-" + l.getReportDepartment();
             if (flagList.contains(key)) {
                 //单位拼接   物资需求表的g列
-                l.setRemarkText("在途已有" + onPassageMaterialsMap.get(key) + companyMap.get(key) +"，请核实本次需求");
-                test.put(key,l.getRemarkText());
+                if (onPassageMaterialsMap.get(key)!= null){
+                    l.setRemarkText("在途已有" + onPassageMaterialsMap.get(key) + companyMap.get(key) +"，请核实本次需求");
+                    test.put(key,l.getRemarkText());
+                }
+
             }
         });
         try {