代码合并问题

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java

@@ -785,7 +785,6 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
 
             sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(), draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),
                     breviary.toString(), dataFilterResult.getData().getAgencyId(), draft.getGridId(), draft.getGroupId());
-            sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
 
             //2021.4.22 start  sun  因业务调整，新增组内消息记录表，新增话题时相应的初始数据
             GroupMessageEntity messageEntity = new GroupMessageEntity();
@@ -927,10 +926,6 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         } else {
             breviary.append("语音话题");
         }
-        sendMqMsg(tokenDto.getUserId(), formDTO.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
-        }else {
-            breviary.append("语音话题");
-        }
         CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
         dataFilterParam.setGridId(formDTO.getGridId());
         dataFilterParam.setUserId(tokenDto.getUserId());