|
@@ -919,9 +919,11 @@ public class ProjectcontentinfoController extends BaseController {
|
|
projectReportData.setTemplateTypeName(projectTemplateType.getTypeName());
|
|
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 ("edit".equals(projectcontentinfo.getFlag())) {
|
|
if("modifyApply".equals(act.getTaskDefKey())){
|
|
if("modifyApply".equals(act.getTaskDefKey())){
|
|
model.addAttribute("condition", "according");
|
|
model.addAttribute("condition", "according");
|