|  |  | @ -19,6 +19,7 @@ package com.epmet.service.impl; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 
			
		
	
		
			
				
					|  |  |  | import com.baomidou.mybatisplus.core.metadata.IPage; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.mybatis.entity.DataScope; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.constant.FieldConstant; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.exception.EpmetErrorCode; | 
			
		
	
	
		
			
				
					|  |  | @ -354,7 +355,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao, | 
			
		
	
		
			
				
					|  |  |  | 		StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); | 
			
		
	
		
			
				
					|  |  |  | 		staffRoleFormDTO.setOrgId(formDTO.getDepartmentId()); | 
			
		
	
		
			
				
					|  |  |  | 		staffRoleFormDTO.setRoleKey(UserRoleConstant.DEPT_LEADER); | 
			
		
	
		
			
				
					|  |  |  | 		List<GovStaffRoleResultDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId()); | 
			
		
	
		
			
				
					|  |  |  | 		List<GovStaffRoleResultDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId(), DataScope.getDefault()); | 
			
		
	
		
			
				
					|  |  |  | 		staffRoleDTOS.forEach(roleDto -> { | 
			
		
	
		
			
				
					|  |  |  | 			staffList.stream().filter(staffDto -> | 
			
		
	
		
			
				
					|  |  |  | 					roleDto.getStaffId().equals(staffDto.getStaffId())).findAny().ifPresent(result -> | 
			
		
	
	
		
			
				
					|  |  | 
 |