소스 검색

全过程暂存流程为空判定调整

user5 2 년 전
부모
커밋
ee2d18acff
1개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 3
      src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

+ 5 - 3
src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -919,9 +919,11 @@ public class ProjectcontentinfoController extends BaseController {
 						projectReportData.setTemplateTypeName(projectTemplateType.getTypeName());
 					}
 				}
-
-				Act act = getByAct(projectReportData.getProcessInstanceId());
-				projectReportData.setAct(act);
+				Act act = new Act();
+				if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
+					act = getByAct(projectReportData.getProcessInstanceId());
+					projectReportData.setAct(act);
+				}
 				if ("edit".equals(projectcontentinfo.getFlag())) {
 					if("modifyApply".equals(act.getTaskDefKey())){
 						model.addAttribute("condition", "according");