修复关注status bug，博客删除空指针bug，tags bug

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

@@ -2,13 +2,11 @@ package cn.meteor.beyondclouds.modules.blog.service.impl;
 
 import cn.meteor.beyondclouds.modules.blog.bean.BlogDetail;
 import cn.meteor.beyondclouds.modules.blog.entity.Blog;
-import cn.meteor.beyondclouds.modules.blog.entity.BlogComment;
 import cn.meteor.beyondclouds.modules.blog.entity.BlogExt;
 import cn.meteor.beyondclouds.modules.blog.entity.BlogTag;
 import cn.meteor.beyondclouds.modules.blog.enums.BlogErrorCode;
 import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException;
 import cn.meteor.beyondclouds.modules.blog.mapper.BlogMapper;
-import cn.meteor.beyondclouds.modules.blog.mapper.BlogTagMapper;
 import cn.meteor.beyondclouds.modules.blog.service.IBlogCommentService;
 import cn.meteor.beyondclouds.modules.blog.service.IBlogExtService;
 import cn.meteor.beyondclouds.modules.blog.service.IBlogService;
@@ -19,7 +17,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.util.BeanUtil;
 import lombok.extern.java.Log;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +25,6 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -102,36 +98,38 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
     @Override
     public void deleteBlog(String userId, String blogId) throws BlogServiceException {
         //1.判断要删除的博客是否是当前用户所有
-        Blog blog = getById(blogId);
-
-        if (!userId.equals(blog.getUserId())) {
-            throw new BlogServiceException(BlogErrorCode.USERID_AUTH_ERROR);
-        }
-        //2.判断当前博客是否存在
-        if (getById(blogId) == null) {
+        QueryWrapper<Blog> blogQueryWrapper = new QueryWrapper<>();
+        blogQueryWrapper
+                .eq("user_id", userId)
+                .eq("blog_id", blogId);
+        Blog blog = getOne(blogQueryWrapper);
+
+        //1.判断当前用户是否发表过该博客
+        if (blog == null) {
             throw new BlogServiceException(BlogErrorCode.BLOG_NOT_FOUND);
         }
-        //3.删除博客评论表
+
+        //2.删除博客评论表
         QueryWrapper queryWrapperComment =  new QueryWrapper();
         queryWrapperComment.eq("blog_id",blogId);
         blogCommentService.remove(queryWrapperComment);
 
-        //4.删除博客内容
+        //3.删除博客内容
         QueryWrapper queryWrapperExt = new QueryWrapper();
         queryWrapperComment.eq("blog_id", blogId);
         blogExtService.remove(queryWrapperExt);
 
-        //5.删除博客标签
+        //4.删除博客标签
         QueryWrapper queryWrapperTag = new QueryWrapper();
         queryWrapperTag.eq("blog_id", blogId);
         blogTagService.remove(queryWrapperTag);
 
-        //7.删除博客引用的话题
+        //5.删除博客引用的话题
         QueryWrapper queryWrapperTopic = new QueryWrapper();
         queryWrapperTopic.eq("referencer_id", blogId);
         topicReferenceService.remove(queryWrapperTopic);
 
-        //8.删除博客表里的数据
+        //6.删除博客表里的数据
         removeById(blogId);
     }
 

src/main/java/cn/meteor/beyondclouds/modules/question/service/impl/QuestionTagServiceImpl.java

@@ -77,6 +77,10 @@ public class QuestionTagServiceImpl extends ServiceImpl<QuestionTagMapper, Quest
                 .collect(Collectors.toList());
 
         // 3.根据tagIds查询出标签并返回
+        if (tagIds.size() > 0) {
             return tagService.listByIds(tagIds);
+        } else {
+            return null;
+        }
     }
 }

src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserFollowServiceImpl.java

@@ -85,6 +85,7 @@ public class UserFollowServiceImpl extends ServiceImpl<IUserFollowMapper, UserFo
         IPage<UserFollow> page = new Page<>(pageNumber, pageSize);
         QueryWrapper<UserFollow> userFollowQueryWrapper = new QueryWrapper<>();
         userFollowQueryWrapper.eq("followed_id", userId);
+        userFollowQueryWrapper.eq("status", 0);
         return page(page, userFollowQueryWrapper);
     }
 
@@ -100,6 +101,7 @@ public class UserFollowServiceImpl extends ServiceImpl<IUserFollowMapper, UserFo
         IPage<UserFollow> page = new Page<>(pageNumber, pageSize);
         QueryWrapper<UserFollow> userFollowQueryWrapper = new QueryWrapper<>();
         userFollowQueryWrapper.eq("follower_id", userId);
+        userFollowQueryWrapper.eq("status", 0);
         return page(page, userFollowQueryWrapper);
     }
 }