diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java index 4ffddb9ba4..62f3100301 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java @@ -51,7 +51,11 @@ public class ProjectDetailResultDTO implements Serializable { /** * 当前跟进部门 */ - private List departmentNameList; + private List departmentNameList; + /** + * 当前跟进部门 + */ + private List departmentList; @NoArgsConstructor @Data diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 3c572a6eac..31566fc96b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -280,11 +280,13 @@ public class ProjectServiceImpl extends BaseServiceImpl departments = new ArrayList<>(); List departmentNameList = new ArrayList<>(); List departmentList = new ArrayList<>(); if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) { //项目已结案,跟进部门为空 - resultDTO.setDepartmentNameList(departmentList); + resultDTO.setDepartmentList(departmentList); + resultDTO.setDepartmentNameList(departments); } else { //项目未结案,找出所有跟进部门 ProjectDTO projectDTO = new ProjectDTO(); @@ -313,8 +315,10 @@ public class ProjectServiceImpl extends BaseServiceImpl