Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp

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);

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;
 }

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;
     }