From f29b16a2c7767ef9fad6890c1cf8429b0afce104 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 Jan 2021 15:26:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=A7=AF=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/service/impl/ResiTopicServiceImpl.java     | 5 +++--
 1 file changed, 3 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 7d6525228d..aa4d42bac9 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
@@ -2034,12 +2034,13 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 			pointEventMsg.setUserId(topic.getCreatedBy());
 			pointEventMsg.setActionFlag(MqConstant.PLUS);
 			pointEventMsg.setIsCommon(false);
-			pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_ISSUE.getEventTag());
+			pointEventMsg.setEventTag(EventEnum.TOPIC_SHIFTED_TO_PROJECT.getEventTag());
 			//某某小组中发布的话题“某某某…” （前十个字后面省略号） 被转为议题
 			String content = CharMatcher.WHITESPACE.trimFrom(topic.getTopicContent());
 			pointEventMsg.setRemark(new StringBuilder(group.getGroupName()).append("小组中发布的")
 					.append(
-							StringUtils.isBlank(content) ? "语音话题" :
+							StringUtils.isBlank(content) ||
+                                    StringUtils.equals("语音话题",content) ? "语音话题" :
 									"话题\"" +
 											content
 													.substring(NumConstant.ZERO,content.length() < NumConstant.TEN ? content.length() : NumConstant.TEN)

From f504dfd1d156e97bcec2963414d31564427b6219 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 Jan 2021 15:36:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E6=9D=BF=E7=9A=84=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E4=B8=8A=E9=99=90=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql     | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql
new file mode 100644
index 0000000000..04ae7bf19d
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.6__editResiGroupRuleUpLimitDesc.sql
@@ -0,0 +1,4 @@
+update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'publish_one_topic';
+update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'participate_one_topic';
+update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'shift_topic_to_issue';
+update `point_rule_default` set up_limit_desc = '每日该项所得积分总和上限，为0时表示没有积分上限' where event_code = 'invite_resi_into_group';
\ No newline at end of file