Kaynağa Gözat

实施前期添加复核失败错误修改

user5 4 yıl önce
ebeveyn
işleme
d2d65ee925

+ 2 - 3
src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -252,9 +252,8 @@ public class ProjectEarlyReviewController extends BaseController {
             }
             return "modules/projectcontentinfo/reportInvalid";
         }else{
-            if (projectReportData != null && projectReportData.getCreateBy() != null && StringUtils.isNotBlank(projectReportData.getCreateBy().getId()) && projectReportData.getCreateBy().getId().equals(UserUtils.getUser().getId())) {
-                return "modules/projectrecord/workContentFromAndView/reportForm";
-            } else if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
+            if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
+                model.addAttribute("condition", projectcontentinfo.getCondition());
                 return "modules/projectrecord/workContentFromAndView/reportForm";
             } else {
                 return "modules/projectcontentinfo/reportView";

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyReviewList.jsp

@@ -424,7 +424,7 @@
 					].join('');
 				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&condition=according&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 					].join('');
 				}else{
 					return[''].join('');