| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -102,7 +102,6 @@ import lombok.extern.slf4j.Slf4j; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.apache.commons.lang3.StringUtils; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.apache.commons.logging.Log; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.apache.commons.logging.LogFactory; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.jsoup.helper.StringUtil; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.springframework.beans.factory.annotation.Autowired; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.springframework.beans.factory.annotation.Value; | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					import org.springframework.stereotype.Service; | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -907,20 +906,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    private Result verifyLeader(ResiTopicEntity topic,String userId){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        if(null != topic){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ResiGroupMemberDTO leaderVerify = resiGroupMemberDao.selectLeaderMember(topic.getGroupId()); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            if(null != leaderVerify){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                //1.2判断是否是组长
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                if(!StringUtils.equals(leaderVerify.getCustomerUserId(),userId)){ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    //非组长,无权限进行操作
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    logger.error(ModuleConstant.NO_TEAMLEADER_AUTH); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    throw new RenException(ModuleConstant.NO_TEAMLEADER_AUTH); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                }else{ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    //是组长
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    return new Result(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            }else{ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                //未找到当前用户的成员信息
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                logger.error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                throw new RenException(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            if (null == leaderVerify) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                throw new RenException(String.format("没有找到该组组长,groupId=%s", topic.getGroupId())); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            //1.2判断是否是组长
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            if (!StringUtils.equals(leaderVerify.getCustomerUserId(), userId)) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                //非组长,无权限进行操作
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                logger.error(ModuleConstant.NO_TEAMLEADER_AUTH); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                throw new RenException(ModuleConstant.NO_TEAMLEADER_AUTH); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } else { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                //是组长
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                return new Result(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        }else{ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            //未能识别该话题基本信息
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |