From e4eef1c2b061c79cc1c73df36bb0a5165e1c3d6b Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Wed, 13 Jan 2021 10:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index abe4ea56a4..db3c7c47c2 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1880,14 +1880,22 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020/12/31 10:28
      */
     @Override
-    public void sendWxmpUpdateSubscribe(TokenDto tokenDto, String topicId, String type) {
-        if (StringUtils.isBlank(type) || StringUtils.isBlank(topicId)) {
+    public void sendWxmpUpdateSubscribe(TokenDto tokenDto, String sourceId, String type) {
+        if (StringUtils.isBlank(type) || StringUtils.isBlank(sourceId)) {
             logger.warn("话题转议题-sourceType活sourceId为空");
             return;
         }
         try{
             //获取话题的groupId,创建人
-            ResiTopicEntity resiTopicEntity = baseDao.selectById(topicId);
+            ResiTopicEntity resiTopicEntity = null;
+            if (WxmpSubscribeConstant.TYPE_COMMENT.equals(type)){
+                resiTopicEntity = baseDao.selectById(sourceId);
+            }
+            if (WxmpSubscribeConstant.TYPE_SHIFT_ISSUE.equals(type)){
+                resiTopicEntity = baseDao.selectOne(new QueryWrapper<ResiTopicEntity>()
+                        .eq("del_flag",0)
+                        .eq("issue_id",sourceId));
+            }
             if (resiTopicEntity == null){
                 log.warn("sendWxmpUpdateSubscribe根据topicid获取议题详情为空");
                 return;
@@ -1900,7 +1908,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             String gridId = resiGroupEntity.getGridId();
             //获取所有关心这个话题的userId列表(发布者+评论者)
             ResiQueryCommentFormDTO resiQueryCommentFormDTO = new ResiQueryCommentFormDTO();
-            resiQueryCommentFormDTO.setTopicId(topicId);
+            resiQueryCommentFormDTO.setTopicId(resiTopicEntity.getId());
             resiQueryCommentFormDTO.setPageNo(1);
             resiQueryCommentFormDTO.setPageSize(10000);
             List<ResiCommentResultDTO> commentList = resiTopicCommentService.getCommentList(tokenDto, resiQueryCommentFormDTO).getData();
@@ -1928,7 +1936,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 subscribeUpdateFormDTO.setClientType(WxmpMessageConstant.RESI);
                 subscribeUpdateFormDTO.setCustomerId(customerId);
                 subscribeUpdateFormDTO.setGridId(gridId);
-                subscribeUpdateFormDTO.setSourceId(topicId);
+                subscribeUpdateFormDTO.setSourceId(sourceId);
                 subscribeUpdateFormDTO.setMessageTime(now);
                 subscribeUpdateFormDTO.setUserId(toUser);
                 msgList.add(subscribeUpdateFormDTO);
@@ -1937,7 +1945,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 epmetMessageOpenFeignClient.sendWxSubscribeUpdate(msgList);
             }
         }catch (Exception e){
-            logger.warn("话题相关 发送微信订阅失败,"+e.getMessage()+",topicId="+topicId+" 类型="+type);
+            logger.warn("话题相关 发送微信订阅失败,"+e.getMessage()+",sourceId="+sourceId+" 类型="+type);
         }
     }
     /**