From f8674741b17f9491675a851bb1ead54d8ea467f5 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 Jan 2021 11:00:53 +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=20sql=E8=84=9A=E6=9C=AC=E4=BF=AE=E6=94=B9=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E8=A7=84=E5=88=99=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.5__editResiGroupRuleCode.sql          | 4 ++++
 .../modules/topic/service/impl/ResiTopicServiceImpl.java    | 6 ++++--
 .../modules/topic/service/impl/TopicDraftServiceImpl.java   | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql
new file mode 100644
index 0000000000..4c3e4183f3
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.5__editResiGroupRuleCode.sql
@@ -0,0 +1,4 @@
+update `point_rule_default` set event_code = 'invite_new_into_group' where event_code = 'invite_new_resident_into_group';
+update `point_rule_default` set event_code = 'invite_resi_into_group' where event_code = 'invite_resident_into_group';
+update `point_rule_default` set event_code = 'topic_to_issue' where event_code = 'topic_shifted_to_issue';
+update `point_rule_default` set event_code = 'topic_to_project' where event_code = 'topic_shifted_to_project';
\ No newline at end of file
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 8dee3181c5..7d6525228d 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
@@ -1605,7 +1605,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
 				pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的")
 						.append(
-						StringUtils.isBlank(content) ? "语音话题" :
+						StringUtils.isBlank(content)
+                                || StringUtils.equals("语音话题",content)? "语音话题" :
 								"话题\"" +
                                         content
 										.substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN)
@@ -1739,7 +1740,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
             pointEventMsg.setRemark(new StringBuilder(groupCache.getGroupName()).append("小组中发布的")
                     .append(
-                            StringUtils.isBlank(content) ? "语音话题" :
+                            StringUtils.isBlank(content)
+                                    || StringUtils.equals("语音话题",content)? "语音话题" :
                                     "话题\"" +
                                             content
                                                     .substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN)
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 2ee3045407..0bd6bb3135 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -889,8 +889,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         TopicDraftEntity draft = baseDao.selectById(draftId);
         StringBuilder breviary = new StringBuilder();
         String content = CharMatcher.WHITESPACE.trimFrom(draft.getTopicContent());
-        if(!StringUtils.isBlank(content)){
-            breviary.append("\"");
+        if(!StringUtils.isBlank(content) && !StringUtils.equals("语音话题",content)){
+            breviary.append("话题\"");
             breviary.append(content.length() > NumConstant.TEN ?  (content.substring(NumConstant.ZERO,NumConstant.TEN) + "…") : content);
             breviary.append("\"");
         }else breviary.append("语音话题");
@@ -922,7 +922,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         actPointEventMsg.setUserId(userId);
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
-        actPointEventMsg.setRemark(new StringBuilder(groupName).append("小组中发布话题").append(topicBreviary).toString());
+        actPointEventMsg.setRemark(new StringBuilder(groupName).append("小组中发布").append(topicBreviary).toString());
         actPointEventMsg.setTargetDate(targetDate);
         actPointEventMsg.setEventTag(EventEnum.PUBLISH_ONE_TOPIC.getEventTag());
         actPointEventMsgList.add(actPointEventMsg);