From e216085dccb46b7a61eee08d750a44a8c00c15a1 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 12 Jan 2021 11:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IssueShareLinkRecordServiceImpl.java   | 4 ++--
 .../group/dto/topic/result/TopicBelongGroupResultDTO.java     | 2 ++
 .../topic/service/impl/TopicShareLinkRecordServiceImpl.java   | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java
index 8f00023c0c..687ce57e47 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueShareLinkRecordServiceImpl.java
@@ -127,10 +127,10 @@ public class IssueShareLinkRecordServiceImpl extends BaseServiceImpl<IssueShareL
         }
         IssueShareLinkRecordEntity entity = new IssueShareLinkRecordEntity();
         entity.setCustomerId(issueInfo.getCustomerId());
-        if (StringUtils.isBlank(topicInfo.getData().getGroupId())){
+        if (StringUtils.isBlank(topicInfo.getData().getGridId())){
             throw new RenException(IssueShareConstant.TOPIC_BELONG_GROUP_NULL);
         }
-        entity.setGridId(topicInfo.getData().getGroupId());
+        entity.setGridId(topicInfo.getData().getGridId());
         entity.setIssueId(formDTO.getIssueId());
         entity.setShareUserId(tokenDto.getUserId());
         entity.setInviteContent(null);
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicBelongGroupResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicBelongGroupResultDTO.java
index 275813b5c6..f9de2af12b 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicBelongGroupResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/TopicBelongGroupResultDTO.java
@@ -18,4 +18,6 @@ public class TopicBelongGroupResultDTO implements Serializable {
     private static final long serialVersionUID = 8180287697221964032L;
 
     private String groupId;
+
+    private String gridId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
index 4163761b96..d686cfc825 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicShareLinkRecordServiceImpl.java
@@ -164,6 +164,7 @@ public class TopicShareLinkRecordServiceImpl extends BaseServiceImpl<TopicShareL
         }
         TopicBelongGroupResultDTO resultDTO = new TopicBelongGroupResultDTO();
         resultDTO.setGroupId(topicInfo.getGroupId());
+        resultDTO.setGridId(topicInfo.getGridId());
         return resultDTO;
     }