Merge branch 'v2.3.1' into 'dev'

递归删除评论的回复 fix

See merge request !88

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

@@ -241,8 +241,9 @@ public class CommentManager {
             ThemeEntity themeEntity = themeService.queryByThemeId(commentEntity.getThemeId());
             notificationService.deleteCommentNotify(themeEntity.getAuthorId(), userId, commentId, commentEntity.getCreateTime());
             // 递归
-            commentId = commentEntity.getReplyId();
-            userId = commentEntity.getReplyUserId();
+            CommentEntity replyForComment =commentService.queryReplyForComment(commentId);
+            commentId = replyForComment.getCommentId();
+            userId = replyForComment.getAuthorId();
         }
 
     }

community-service/src/main/java/com/tanpu/community/service/CommentService.java

@@ -224,4 +224,20 @@ public class CommentService {
         }
 
     }
+
+    /**
+     * 获取对该评论的回复，如果没有则返回空对象
+     * @param commentId
+     * @return
+     */
+    public CommentEntity queryReplyForComment(String commentId) {
+        List<CommentEntity> replies = commentMapper.selectList(new LambdaQueryWrapper<CommentEntity>()
+                .eq(CommentEntity::getReplyId, commentId)
+                .eq(CommentEntity::getDeleteTag, DeleteTagEnum.NOT_DELETED));
+        if (CollectionUtils.isEmpty(replies)){
+            return replies.get(0);
+        }else {
+            return new CommentEntity();
+        }
+    }
 }