Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -363,6 +363,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         List<ProjectStaffDTO> departmentNameList = new ArrayList<>();
         List<ProjectDetailResultDTO.DepartmentNameListBean> departmentList = new ArrayList<>();
         ProjectDetailResultDTO projectDetailResultDTO = projectDao.selectProjectDetail(formDTO.getProjectId());
+        if (null == projectDetailResultDTO){
+            result.setDepartmentList(departmentList);
+            result.setDepartmentNameList(departments);
+        }
         if (ProjectConstant.CLOSED.equals(projectDetailResultDTO.getProjectStatus())) {
             //项目已结案，跟进部门为空
             result.setDepartmentList(departmentList);