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

5 years ago · 69f3a55a0c
1 changed files with 1 additions and 0 deletions
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
@ -366,6 +366,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
        if (null == projectDetailResultDTO){
            result.setDepartmentList(departmentList);
            result.setDepartmentNameList(departments);
+            return result;
        }
        if (ProjectConstant.CLOSED.equals(projectDetailResultDTO.getProjectStatus())) {
            //项目已结案，跟进部门为空