Merge branch 'dev_bugfix' into dev

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

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;