From 5a34198ce4f351c55b04bc725df93fc1012ec8c3 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 18 Dec 2019 17:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/constant/EventsNoticeConstant.java  | 6 +++---
 .../service/impl/EventCommentUserAttitudeServiceImpl.java   | 4 ++--
 .../issue/service/impl/EventUserAttitudeServiceImpl.java    | 4 ++--
 .../dto/constant/GroupNoticeConstant.java                   | 2 +-
 .../dto/constant/TopicNoticeConstant.java                   | 2 +-
 .../service/impl/TopicCommentUserAttitudeServiceImpl.java   | 2 +-
 .../modules/topic/service/impl/TopicServiceImpl.java        | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java
index bf83bead5..9655eb4aa 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java
@@ -50,7 +50,7 @@ public interface EventsNoticeConstant {
     /**
      * 议题反对
      */
-    String NOTICE_ISSUE_OPPOSE = "你的议题【有新的反对】";
+    String NOTICE_ISSUE_OPPOSE = "你的议题【有新的不支持】";
     /**
      * 项目支持
      */
@@ -58,7 +58,7 @@ public interface EventsNoticeConstant {
     /**
      * 项目反对
      */
-    String NOTICE_ITEM_OPPOSE = "你的项目【有新的反对】";
+    String NOTICE_ITEM_OPPOSE = "你的项目【有新的不支持】";
     /**
      * 评论支持
      */
@@ -66,7 +66,7 @@ public interface EventsNoticeConstant {
     /**
      * 评论反对
      */
-    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的反对】";
+    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的不支持】";
     /**
      * 项目被评论
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java
index 7f6c31374..dffdcf12e 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java
@@ -205,7 +205,7 @@ public class EventCommentUserAttitudeServiceImpl extends BaseServiceImpl<EventCo
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_COMMENT_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ISSUE_COMMENT_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的评论");
             }
         } else {
             // 项目
@@ -219,7 +219,7 @@ public class EventCommentUserAttitudeServiceImpl extends BaseServiceImpl<EventCo
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_COMMENT_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM_COMMENT_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的评论");
             }
         }
         // 发送消息
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java
index bdc54bcc0..a0fc5ffac 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java
@@ -214,7 +214,7 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE__BUSINESS_TYPE_ISSUE_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的议题");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的议题");
             }
         } else {
             // 项目
@@ -230,7 +230,7 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
                 // 反对
                 informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_OPPOSE);
                 informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM_OPPOSE);
-                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的项目");
+                informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的项目");
             }
         }
         // 发送消息
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
index e1ec2a4c9..54babb9f1 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java
@@ -22,7 +22,7 @@ public interface GroupNoticeConstant {
     /**
      * 社群解散
      */
-    String NOTICE_GROUP_DISBAND = "您加入的社群已被解散";
+    String NOTICE_GROUP_DISBAND = "您所在的社群已被解散";
 
     /**
      * 删除社群成员
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java
index a86d6702a..647b9884f 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/TopicNoticeConstant.java
@@ -21,7 +21,7 @@ public interface TopicNoticeConstant {
     /**
      * 评论反对
      */
-    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的反对】";
+    String NOTICE_COMMENT_OPPOSE = "你的评论【有新的不支持】";
 
 
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
index f53999cb2..0f6f2277a 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentUserAttitudeServiceImpl.java
@@ -150,7 +150,7 @@ public class TopicCommentUserAttitudeServiceImpl extends BaseServiceImpl<TopicCo
                     // 反对
                     informationFormDTO.setTitle(TopicNoticeConstant.NOTICE_COMMENT_OPPOSE);
                     informationFormDTO.setBusinessType(TopicNoticeConstant.NOTICE_BUSINESS_TYPE_TOPIC_COMMENT_OPPOSE);
-                    informationFormDTO.setRelBusinessContent(formDto.getUserName()+"反对了你的评论");
+                    informationFormDTO.setRelBusinessContent(formDto.getUserName()+"不支持你的评论");
                 }
 
             }else {
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index 2ecf53b3e..6a3d4f7f2 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -213,7 +213,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
 
             // 获取群主信息
             UserGroupDTO userGroupDto = userGroupService.getLordInfoByGroupId(resultDto.getGroupId());
-            if (formDto.getUserId().equals(userGroupDto.getUserId())) {
+            if (null != userGroupDto && formDto.getUserId().equals(userGroupDto.getUserId())) {
                 resultDto.setLordFlag(NumConstant.ONE_STR);
             } else {
                 resultDto.setLordFlag(NumConstant.ZERO_STR);