|
@@ -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";
|