/gov/issue/issuesharelink/createurl兼容

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java

@@ -9,10 +9,11 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.IssueShareConstant;
 import com.epmet.dao.IssueShareLinkRecordDao;
 import com.epmet.dao.IssueShareLinkVisitRecordDao;
+import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueShareLinkRecordDTO;
 import com.epmet.dto.form.IssueCreateUrlFormDTO;
 import com.epmet.dto.form.IssueVisitFormDTO;
@@ -20,9 +21,8 @@ import com.epmet.dto.result.IssueCreateUrlResultDTO;
 import com.epmet.dto.result.IssueVisitResultDTO;
 import com.epmet.entity.IssueShareLinkRecordEntity;
 import com.epmet.entity.IssueShareLinkVisitRecordEntity;
-import com.epmet.resi.group.dto.topic.form.TopicBelongGroupFormDTO;
-import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import com.epmet.service.IssueService;
 import com.epmet.service.IssueShareLinkRecordService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -118,19 +118,24 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareL
         if (null == issueInfo){
             throw new RenException(IssueShareConstant.NOT_EXIST_ISSUE_INFO);
         }
-        TopicBelongGroupFormDTO topicBelongGroupFormDTO = new TopicBelongGroupFormDTO();
-        topicBelongGroupFormDTO.setTopicId(issueInfo.getTopicId());
-        // 查询议题来源所属小组【话题所属小组】
-        Result<TopicBelongGroupResultDTO> topicInfo = resiGroupOpenFeignClient.selectTopicBelongGroup(topicBelongGroupFormDTO);
-        if (!topicInfo.success()){
-            throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_FAILURE);
-        }
+        IssueDTO issueEntity= SpringContextUtils.getBean(IssueService.class).get(formDTO.getIssueId());
+        //并改成兼容，发现不需要查询话题的网格id， 索性注释了吧
+        /*if("resi_topic".equals(issueEntity.getSourceType())){
+            TopicBelongGroupFormDTO topicBelongGroupFormDTO = new TopicBelongGroupFormDTO();
+            topicBelongGroupFormDTO.setTopicId(issueInfo.getTopicId());
+            // 查询议题来源所属小组【话题所属小组】
+            Result<TopicBelongGroupResultDTO> topicInfo = resiGroupOpenFeignClient.selectTopicBelongGroup(topicBelongGroupFormDTO);
+            if (!topicInfo.success()){
+                throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_FAILURE);
+            }
+            if (StringUtils.isBlank(topicInfo.getData().getGridId())){
+                throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_NULL);
+            }
+        }*/
         IssueShareLinkRecordEntity entity = new IssueShareLinkRecordEntity();
         entity.setCustomerId(issueInfo.getCustomerId());
-        if (StringUtils.isBlank(topicInfo.getData().getGridId())){
-            throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_NULL);
-        }
-        entity.setGridId(topicInfo.getData().getGridId());
+        // entity.setGridId(topicInfo.getData().getGridId());//注释原因同上
+        entity.setGridId(issueEntity.getGridId());
         entity.setIssueId(formDTO.getIssueId());
         entity.setShareUserId(tokenDto.getUserId());
         entity.setInviteContent(null);