diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 98d20c5939..96f51e83ec 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -3,9 +3,6 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.DepartmentInStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
@@ -16,7 +13,6 @@ import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
index 0177e9a6bc..273b6172d1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -4,15 +4,12 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.StaffGridListDTO;
+import com.epmet.dto.form.DepartmentInStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
-import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.DepartInStaffListResultDTO;
+import com.epmet.dto.result.StaffDetailResultDTO;
 import com.epmet.dto.result.StaffInfoResultDTO;
 import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 7621320bb7..fdd47f560d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -31,23 +30,8 @@ import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.CustomerStaffDao;
 import com.epmet.dto.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.GovStaffRoleDTO;
-import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.StaffRoleDTO;
-import com.epmet.dto.form.CustomerStaffFormDTO;
-import com.epmet.dto.form.StaffInfoFromDTO;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
-import com.epmet.dto.form.StaffRoleFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
-import com.epmet.dto.result.StaffDetailResultDTO;
-import com.epmet.dto.result.DepartInStaffListResultDTO;
-import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffInitResultDTO;
-import com.epmet.dto.result.StaffRoleResultDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerStaffEntity;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
@@ -351,16 +335,21 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return gridStaffCountDTOResult;
     }
 
-    @Override
-    public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO formDTO) {
-        //1:根据userId集合查询人员基本信息
-        List<DepartInStaffListResultDTO> list = baseDao.selectDepartmentStaffList(formDTO);
-        //2:根据部门Id查询部门下是领导角色的用户
-        StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO();
-        staffRoleFormDTO.setOrgId(formDTO.getDepartmentId());
-        staffRoleFormDTO.setRoleKey(UserRoleConstant.DEPT_LEADER);
-
-        return new Result<List<DepartInStaffListResultDTO>>().ok(list);
-    }
+	@Override
+	public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO formDTO) {
+		//1:根据userId集合查询人员基本信息
+		List<DepartInStaffListResultDTO> staffList = baseDao.selectDepartmentStaffList(formDTO);
+		//2:根据部门Id查询部门下是领导角色的用户
+		StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO();
+		staffRoleFormDTO.setOrgId(formDTO.getDepartmentId());
+		staffRoleFormDTO.setRoleKey(UserRoleConstant.DEPT_LEADER);
+		List<GovStaffRoleResultDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId());
+		staffRoleDTOS.forEach(roleDto -> {
+			staffList.stream().filter(staffDto ->
+					roleDto.getStaffId().equals(staffDto.getStaffId())).findAny().ifPresent(result ->
+					result.setRoleName(roleDto.getRoleName()));
+		});
+		return new Result<List<DepartInStaffListResultDTO>>().ok(staffList);
+	}
 
 }
\ No newline at end of file