From 5092b453fe61d7d2ace14a1f5f98ff88412b8dc9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 26 Aug 2020 16:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-=E8=B7=9F?=
 =?UTF-8?q?=E8=BF=9B=E9=83=A8=E9=97=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/ProjectDetailResultDTO.java | 6 +++++-
 .../java/com/epmet/service/impl/ProjectServiceImpl.java   | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

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<DepartmentNameListBean> departmentNameList;
+	private List<String> departmentNameList;
+	/**
+	 * 当前跟进部门
+	 */
+	private List<DepartmentNameListBean> 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<ProjectDao, ProjectEntit
 		}
 
 		//获取当前跟进部门
+		List<String> departments = new ArrayList<>();
 		List<ProjectStaffDTO> departmentNameList = new ArrayList<>();
 		List<ProjectDetailResultDTO.DepartmentNameListBean> 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<ProjectDao, ProjectEntit
 								staffDto.getStaffId().equals(staffInfo.getStaffId())).map((StaffSinGridResultDTO::getStaffName))).collect(Collectors.toList());
 				bean.setStaffList(staffNameList);
 				departmentList.add(bean);
+				departments.add(departmentName);
 			}
-			resultDTO.setDepartmentNameList(departmentList);
+			resultDTO.setDepartmentList(departmentList);
+			resultDTO.setDepartmentNameList(departments);
 		}
 
 		return resultDTO;