Merge branch 'master' of http://git.ycjcjy.com/whole-estate/service

whole-estate/src/main/java/com/example/wholeestate/model/Encyclopedia.java

@@ -1,5 +1,6 @@
 package com.example.wholeestate.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +29,7 @@ public class Encyclopedia implements Serializable {
 
     private String title;
 
+    @TableField("`desc`")
     private String desc;
 
     private String imgUrl;
@@ -40,6 +42,7 @@ public class Encyclopedia implements Serializable {
 
     private String content;
 
+    @TableField("`status`")
     private Integer status;
 
     private LocalDateTime createDate;

whole-estate/src/main/java/com/example/wholeestate/service/impl/CommentServiceImpl.java

@@ -168,6 +168,16 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
             childCommentQuery.eq("parent_id", e.getCommentId());
             childCommentQuery.eq("status", 1);
             List<Comment> comments = commentMapper.selectList(childCommentQuery);
+
+            comments.forEach(x -> {
+                    // 查询图片
+                QueryWrapper<CommentImg> queryPImgWrapper = new QueryWrapper<>();
+                queryPImgWrapper.eq("comment_id", e.getCommentId());
+                queryPImgWrapper.eq("status", 1);
+                queryPImgWrapper.orderByAsc("order_no");
+                List<CommentImg> commentFImgs = commentImgMapper.selectList(queryPImgWrapper);
+                x.setCommentImgList(commentFImgs);
+            });
             e.setChildComment(comments);
 
             // 查询图片