| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -383,10 +383,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//1:根据userId集合查询人员基本信息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<DepartInStaffListResultDTO> staffList = baseDao.selectDepartmentStaffList(formDTO); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//2:根据组织Id查询部门下是领导角色的用户
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							staffRoleFormDTO.setOrgId(formDTO.getAgencyId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							staffRoleFormDTO.setRoleKey(UserRoleConstant.DEPT_LEADER); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<GovStaffRoleResultDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId(), DataScope.getDefault()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							List<GovStaffRoleResultDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getAgencyId(), DataScope.getDefault()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							staffRoleDTOS.forEach(roleDto -> { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								staffList.stream().filter(staffDto -> | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
										roleDto.getStaffId().equals(staffDto.getStaffId())).findAny().ifPresent(result -> | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |