|  | @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import java.util.List;
 |  |  import java.util.List;
 | 
											
												
													
														|  |  import java.util.Map;
 |  |  import java.util.Map;
 | 
											
												
													
														|  | 
 |  | +import java.util.Optional;
 | 
											
												
													
														|  |  import java.util.stream.Collectors;
 |  |  import java.util.stream.Collectors;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  /**
 |  |  /**
 | 
											
										
											
												
													
														|  | @@ -58,7 +59,7 @@ public class CustomerServiceReceiveServiceImpl extends ServiceImpl<CustomerServi
 | 
											
												
													
														|  |                      .map(CustomerServiceReceiveWrapper.CustomerServiceReceive::getUserId).distinct().collect(Collectors.toList());
 |  |                      .map(CustomerServiceReceiveWrapper.CustomerServiceReceive::getUserId).distinct().collect(Collectors.toList());
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              Map<Long, String> usernameMap = sysUserMapper.selectBatchIds(userIds).stream()
 |  |              Map<Long, String> usernameMap = sysUserMapper.selectBatchIds(userIds).stream()
 | 
											
												
													
														|  | -                    .collect(Collectors.toMap(SysUser::getId, SysUser::getUsername, (o, n) -> n));
 |  | 
 | 
											
												
													
														|  | 
 |  | +                    .collect(Collectors.toMap(SysUser::getId, x -> Optional.ofNullable(x.getUsername()).orElse(""), (o, n) -> n));
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              for (CustomerServiceReceiveWrapper.CustomerServiceReceive item : receives) {
 |  |              for (CustomerServiceReceiveWrapper.CustomerServiceReceive item : receives) {
 | 
											
												
													
														|  |  
 |  |  
 |