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

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

@@ -1621,7 +1621,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 				//将话题“某某某…” （前十个字后面省略号） 转为议题
 				pointEventMsg2.setRemark(new StringBuilder("将话题")
 						.append(
-                                new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst("小组中发布的",""))
+                                new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst(new StringBuilder(groupCache.getGroupName()).append("小组中发布的").toString(),""))
                                         .reverse().toString()
                                         .replaceFirst("题议为转被","")).reverse()
                         ).append("转为议题").toString());
@@ -1755,7 +1755,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             //将话题“某某某…” （前十个字后面省略号） 转为议题
             pointEventMsg2.setRemark(new StringBuilder("将话题")
                     .append(
-                         new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst("小组中发布的","")).reverse()
+                         new StringBuilder(new StringBuilder(pointEventMsg.getRemark().replaceFirst(new StringBuilder(groupCache.getGroupName()).append("小组中发布的").toString(),"")).reverse()
                                  .toString().replaceFirst("题议为转被","")).reverse()
                     ).append("转为议题").toString());
             pointEventMsgList.add(pointEventMsg2);