空行验证错误调整

src/main/java/com/jeeplus/modules/sealApplyFor/web/SealApplyForController.java

@@ -129,15 +129,17 @@ public class SealApplyForController extends BaseController {
                 String reportNumber = "";
                 for (int j=0;j<projectIdList.size();j++) {
                     SealApplyForInfo forInfo = service.getProjectInfoByProId(projectIdList.get(j));
-                    if (proName.equals("")){
-                        proName = forInfo.getProjectName();
-                    } else {
-                        proName += "," + forInfo.getProjectName();
-                    }
-                    if (StringUtils.isBlank(reportNumber)){
-                        reportNumber = forInfo.getReportDataNum();
-                    } else {
-                        reportNumber = reportNumber + "," + forInfo.getReportDataNum();
+                    if(null != forInfo){
+                        if (proName.equals("")){
+                            proName = forInfo.getProjectName();
+                        } else {
+                            proName += "," + forInfo.getProjectName();
+                        }
+                        if (StringUtils.isBlank(reportNumber)){
+                            reportNumber = forInfo.getReportDataNum();
+                        } else {
+                            reportNumber = reportNumber + "," + forInfo.getReportDataNum();
+                        }
                     }
                 }
                 list.get(i).getProjectRecords().setProjectName(proName);
@@ -372,8 +374,18 @@ public class SealApplyForController extends BaseController {
                 List<SealApplyForInfo> list = sealApplyForInfo.getWorkInvoiceProjectRelationList();
                 RuralProjectRecords projectRecords = projectRecordsService.get(list.get(0).getProjectId());
                 sealApplyForInfo.setProjectRecords(projectRecords);
+
+
+                //排除 重新申请|撤销
+                Iterator<SealApplyForInfo> it = list.iterator();
+                while (it.hasNext()) {
+                    SealApplyForInfo w = it.next();
+                    if ("1".equals(w.getDelFlag())) {
+                        it.remove();
+                    }
+                }
                 for (int i=0;i<list.size();i++){
-                    if (StringUtils.isBlank(list.get(i).getProjectId())){
+                    if (StringUtils.isBlank(list.get(i).getProjectId()) && "0".equals(list.get(i).getDelFlag())){
                         addMessage(redirectAttributes, "未选择项目或该项目无审核人，无法申请盖章");
                         return "redirect:"+Global.getAdminPath()+"/sealApplyFor/sealApplyFor/?repage";
                     }