| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -2685,9 +2685,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            if (groupType.equals(ModuleConstant.GROUP_TYPE_BRANCH)){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                ui.setReleaseUserName(u.getStreet() + "-" + u.getRealName()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            }else { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                if(StringUtils.isNotBlank(u.getGender())){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                if (StringUtils.isBlank(u.getGender())) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    //性别为空,默认为未知
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    u.setGender(NumConstant.ZERO_STR); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                String gender = ModuleConstant.GENDER_NO; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    switch (u.getGender()){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                switch (u.getGender()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    case NumConstant.ONE_STR: | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                        gender = ModuleConstant.GENDER_ONE; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                        break; | 
				
			
			
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
				 | 
				
					@ -2709,7 +2712,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    ui.setReleaseUserName(u.getNickname()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            result.add(ui); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        }); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        if (CollectionUtils.isEmpty(result)){ | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |