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

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';

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

@@ -2054,12 +2054,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)