盖章暂存导出修改

src/main/java/com/jeeplus/modules/sealMaterial/service/SealMaterialService.java

@@ -29,14 +29,17 @@ public class SealMaterialService extends CrudService<SealMaterialDao,SealMateria
         List<String> list = new ArrayList<String>();
         Set<String> set = new HashSet<String>();
 
-        Iterator<SealMaterialInfoImport> it = sealMaterialInfoImportList.iterator();
-        while(it.hasNext()){
-            SealMaterialInfoImport info = it.next();
-            if(StringUtils.isBlank(info.getSealMaterialName()) || null == info.getAmount() || "1".equals(info.getDelFlag())){
-                it.remove();
+        if (null != sealMaterialInfoImportList){
+            Iterator<SealMaterialInfoImport> it = sealMaterialInfoImportList.iterator();
+            while(it.hasNext()){
+                SealMaterialInfoImport info = it.next();
+                if(StringUtils.isBlank(info.getSealMaterialName()) || null == info.getAmount() || "1".equals(info.getDelFlag())){
+                    it.remove();
+                }
             }
         }
 
+
         //材料列表自身重复判断
         if(null != sealMaterialInfoImportList){
             for (SealMaterialInfoImport sealMaterialInfoImport: sealMaterialInfoImportList){

src/main/resources/mappings/modules/sealMaterial/sealMaterialDao.xml

@@ -157,7 +157,7 @@
 		left join project_report_data prd on s.report_number = prd.number
 		left join seal_apply_for_project_info saf on saf.project_id = prd.project_id
 		<where>
-			prd.number is not null and
+			prd.number is not null and s.project_id is not null and
 			saf.id in
 			<foreach collection="idList" item="id" separator="," open="(" close=")">
 				#{id}