| 
						
						
							
								
							
						
						
					 | 
					@ -18,7 +18,6 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					package com.epmet.modules.topic.service.impl; | 
					 | 
					 | 
					package com.epmet.modules.topic.service.impl; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 
					 | 
					 | 
					import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.baomidou.mybatisplus.core.metadata.IPage; | 
					 | 
					 | 
					import com.baomidou.mybatisplus.core.metadata.IPage; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
					 | 
					 | 
					import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -75,9 +74,9 @@ import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; | 
					 | 
					 | 
					import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.ResiTopicDTO; | 
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.ResiTopicDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.TopicInfoDTO; | 
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.TopicInfoDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.form.*; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO; | 
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; | 
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.form.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.result.*; | 
					 | 
					 | 
					import com.epmet.resi.group.dto.topic.result.*; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import lombok.extern.slf4j.Slf4j; | 
					 | 
					 | 
					import lombok.extern.slf4j.Slf4j; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import org.apache.commons.lang3.StringUtils; | 
					 | 
					 | 
					import org.apache.commons.lang3.StringUtils; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -1165,8 +1164,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId())); | 
					 | 
					 | 
					            issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId())); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //4.调用gov-issue新增议题
 | 
					 | 
					 | 
					            //4.调用gov-issue新增议题
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo); | 
					 | 
					 | 
					            Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            if (issueResult == null || !issueResult.success() || StringUtils.isBlank(issueResult.getData())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                throw new RenException(ModuleConstant.CREATE_ISSUE_ERROR); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //5.修改话题shiftIssue字段
 | 
					 | 
					 | 
					            //5.修改话题shiftIssue字段
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){ | 
					 | 
					 | 
					
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            ResiTopicEntity topic2Upd = new ResiTopicEntity(); | 
					 | 
					 | 
					            ResiTopicEntity topic2Upd = new ResiTopicEntity(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            topic2Upd.setId(topicTurnIssueFromDTO.getTopicId()); | 
					 | 
					 | 
					            topic2Upd.setId(topicTurnIssueFromDTO.getTopicId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId()); | 
					 | 
					 | 
					            topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -1196,8 +1198,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                resiGroupRedis.set(groupCache); | 
					 | 
					 | 
					                resiGroupRedis.set(groupCache); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC); | 
					 | 
					 | 
					            logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |