Merge branch 'v2.3.1' into 'dev'

评论的评论

See merge request !72

community-service/src/main/java/com/tanpu/community/manager/CommentManager.java

@@ -101,13 +101,15 @@ public class CommentManager {
         if (themeEntity == null) {
             throw new BizException(ErrorCodeConstant.UNREACHABLE);
         }
-        notificationService.insert(userId, themeEntity.getAuthorId(), NotificationTypeEnum.COMMENT, commentEntity.getCommentId(), req.getComment());
-        notificationService.putNotifyCache(themeEntity.getAuthorId(), userId, NotificationTypeEnum.COMMENT);
 
-        // 回复提醒
+
+        // 一级回复通知发帖人，二级回复通知一级评论人
         if (StringUtils.isNotBlank(req.getReplyUserId())){
             notificationService.insert(userId, req.getReplyUserId(), NotificationTypeEnum.COMMENT_REPLY, commentEntity.getCommentId(), req.getComment());
             notificationService.putNotifyCache(req.getReplyUserId(), userId, NotificationTypeEnum.COMMENT_REPLY);
+        }else {
+            notificationService.insert(userId, themeEntity.getAuthorId(), NotificationTypeEnum.COMMENT, commentEntity.getCommentId(), req.getComment());
+            notificationService.putNotifyCache(themeEntity.getAuthorId(), userId, NotificationTypeEnum.COMMENT);
 
         }