| 
						
						
							
								
							
						
						
					 | 
					@ -151,8 +151,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId()); | 
					 | 
					 | 
					                VolunteerInfoDTO dto = baseDao.selectVolunteerInfoByUserId(tokenDto.getUserId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce() == null ? "" : dto.getVolunteerIntroduce()); | 
					 | 
					 | 
					                resultDTO.setVolunteerIntroduce(dto.getVolunteerIntroduce() == null ? "" : dto.getVolunteerIntroduce()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                resultDTO.setVolunteerSignature(dto.getVolunteerSignature() == null ? "" : dto.getVolunteerSignature()); | 
					 | 
					 | 
					                resultDTO.setVolunteerSignature(dto.getVolunteerSignature() == null ? "" : dto.getVolunteerSignature()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					                resultDTO.setGridId(dto.getGridId() == null ? "" : dto.getGridId()); | 
					 | 
					 | 
					                resultDTO.setGridId(dto.getGridId() == null ? null : dto.getGridId()); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                resultDTO.setGridName(dto.getGridName() == null ? "" : dto.getGridName()); | 
					 | 
					 | 
					                resultDTO.setGridName(dto.getGridName() == null ? null : dto.getGridName()); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } else { | 
					 | 
					 | 
					        } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            logger.error("获取用户基本信息失败"); | 
					 | 
					 | 
					            logger.error("获取用户基本信息失败"); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |