Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -460,23 +460,15 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
-        //判断是否是新数据
-        boolean flag=false;
         for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){
                 if (reviewAudit.getId().equals(audit.getStandardId())){
                     reviewAudit.setDeductOption(audit.getDeductOption());
-                    flag=true;
                     break;
                 }
             }
         }
-        //取出旧数据的标准意见
-        if (!flag){
-            model.addAttribute("list", audits);
-        }else{
-            model.addAttribute("list", workReviewAudits);
-        }
+        model.addAttribute("list", workReviewAudits);
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -812,23 +804,15 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportData.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
-        //判断是否是新数据
-        boolean flag=false;
         for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){
                 if (reviewAudit.getId().equals(audit.getStandardId())){
                     reviewAudit.setDeductOption(audit.getDeductOption());
-                    flag=true;
                     break;
                 }
             }
         }
-        //取出旧数据的标准意见
-        if (!flag){
-            model.addAttribute("list", audits);
-        }else{
-            model.addAttribute("list", workReviewAudits);
-        }
+        model.addAttribute("list", workReviewAudits);
         model.addAttribute("projectReportRecord", projectReportRecord);
         model.addAttribute("project", projectReportRecord.getReport().getProject());
         return "modules/ruralprojectrecords/view/projectReportRecordView";
@@ -1018,23 +1002,15 @@ public class RuralProjectViewController extends BaseController {
         workReviewAudit.setType(type);
         workReviewAudit.setReportId(projectReportDataTwo.getId());
         List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
-        //判断是否是新数据
-        boolean flag=false;
         for(WorkReviewAudit reviewAudit:workReviewAudits){
             for (WorkReviewAudit audit:audits){
                 if (reviewAudit.getId().equals(audit.getStandardId())){
                     reviewAudit.setDeductOption(audit.getDeductOption());
-                    flag=true;
                     break;
                 }
             }
         }
-        //取出旧数据的标准意见
-        if (!flag){
-            model.addAttribute("list", audits);
-        }else{
-            model.addAttribute("list", workReviewAudits);
-        }
+        model.addAttribute("list", workReviewAudits);
         model.addAttribute("processInstanceId",projectReportDataTwo.getProcessInstanceId());
         model.addAttribute("projectReportData",projectReportData);
         model.addAttribute("projectReportDataTwo",projectReportDataTwo);