From 3202e49a8fde5505c5d2f898b09306262f35f5d4 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 30 Dec 2020 17:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E6=8B=BC=E6=8E=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/service/impl/ResiTopicServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 cb42704e9b..1320be4228 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
@@ -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);