我的博客列表和他人博客列表添加标签、类别详细信息

src/main/java/cn/meteor/beyondclouds/modules/blog/entity/Blog.java

@@ -5,6 +5,7 @@ import cn.meteor.beyondclouds.modules.topic.entity.Topic;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +13,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -64,15 +65,17 @@ public class Blog implements Serializable {
     @ApiModelProperty(value = "是否允许转发")
     private Boolean allowForward;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @TableField(exist=false)
     private List<Tag> tags;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @TableField(exist=false)
     private List<Topic> topics;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
 
 }

src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/xml/BlogMapper.xml

@@ -37,7 +37,7 @@
         left join tag t
         on t.tag_id = bt.tag_id
         <if test="ew != null and ew.sqlSegment != null">
-            and ${ew.sqlSegment}
+            where ${ew.sqlSegment}
         </if>
     </select>
 </mapper>

src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java

@@ -279,12 +279,12 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
      */
     @Override
     public IPage<Blog> getUserBlogPage(Integer pageNumber, Integer pageSize, String userId) {
-        QueryWrapper blogQueryWrapper = new QueryWrapper();
-        blogQueryWrapper.eq("user_id", userId);
+        QueryWrapper<Blog> blogQueryWrapper = new QueryWrapper();
+        blogQueryWrapper.eq("b.user_id", userId);
         blogQueryWrapper.eq("view_privileges", 1);
-        blogQueryWrapper.orderByDesc("create_time");
+        blogQueryWrapper.orderByDesc("b.create_time");
         IPage<Blog> page = new Page<>(pageNumber, pageSize);
-        return page(page, blogQueryWrapper);
+        return blogMapper.selectPageWithTags(page, blogQueryWrapper);
     }
 
     /**
@@ -297,10 +297,10 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
     @Override
     public IPage<Blog> getMyBlogPage(Integer pageNumber, Integer pageSize, String userId) {
         QueryWrapper myBlogQueryWrapper = new QueryWrapper();
-        myBlogQueryWrapper.eq("user_id", userId);
-        myBlogQueryWrapper.orderByDesc("create_time");
+        myBlogQueryWrapper.eq("b.user_id", userId);
+        myBlogQueryWrapper.orderByDesc("b.create_time");
         IPage<Blog> page = new Page<>(pageNumber, pageSize);
-        return page(page, myBlogQueryWrapper);
+        return blogMapper.selectPageWithTags(page, myBlogQueryWrapper);
     }
 
     /**