更新

mhotel/src/com/happy/action/articleTweetAction.java

@@ -229,6 +229,7 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
         }
 
         ArticleDetailVo result = new ArticleDetailVo();
+        result.setIsCollect(data.getIsCollect());
         result.setId(data.getId());
         List<FileInfo> fileInfoList = articleTweetService.queryList("and link_id = '" + articleTweetDto.getId() + "'");
         if (fileInfoList != null) {
@@ -335,6 +336,18 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
         //endregion
 
         List<LikeListVo> likes = articleTweetService.queryArticleLikes(articleTweetDto.getId());
+
+        if(likes != null && likes.size() > 0){
+            Optional<LikeListVo> ownerLikes = likes.stream().filter(e -> e.getId().equals(articleTweetDto.getUserId())).findFirst();
+            if(ownerLikes != null && ownerLikes.isPresent()){
+                result.setIsLike(1);
+            }else{
+                result.setIsLike(0);
+            }
+        }else{
+            result.setIsLike(0);
+        }
+
         result.setLikes(likes == null ? new ArrayList<>() : likes.stream().map(LikeListVo::getImage).collect(Collectors.toList()));
         result.setLikeNum(likes == null ? 0 : likes.size());
 
@@ -500,9 +513,11 @@ public class articleTweetAction extends BaseController implements ModelDriven<Ar
         //子级评论数据
         List<ArticleCommentVo> childs = articleTweetService.queryCommentsByArticle(articleTweetDto.getId());
 
-        for (ArticleCommentVo data : result.getPageList()) {
-            List<ArticleCommentVo> comments = QueryTreeDatas(data.getId(), childs);
-            data.setChildrens(comments);
+        if(childs != null && childs.size() > 0){
+            for (ArticleCommentVo data : result.getPageList()) {
+                List<ArticleCommentVo> comments = QueryTreeDatas(data.getId(), childs);
+                data.setChildrens(comments);
+            }
         }
 
         jsonObject.put("code", ResultStatusCode.OK.getStatus());

mhotel/src/com/happy/vo/ArticleDetailVo.java

@@ -45,6 +45,20 @@ public class ArticleDetailVo {
     private Integer isFollow;
 
     /**
+     * 是否收藏文章
+     * 未收藏：0
+     * 已收藏：1
+     */
+    private Integer isCollect;
+
+    /**
+     * 是否点赞文章
+     * 未点赞：0
+     * 已点赞：1
+     */
+    private Integer isLike;
+
+    /**
      * 标题
      */
     private String title;