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