Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java

@@ -6,6 +6,7 @@
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVo;
import org.springframework.stereotype.Service;

/**
@@ -23,7 +24,49 @@
    * @return
    */
   @Override
   public IPage<Article> selectArticlePage(IPage<Article> page, Article article) {
   public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.selectArticlePage(page,article));
   }

   /**
    * 查询资讯分页信息(角色权限)
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<Article> pageDate(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageDate(page,article));
   }

   @Override
   public IPage<Article> pageCollectList(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageCollectList(page,article));
   }

   /**
    * 查询资讯分页信息(角色权限)附带评论点赞数
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<Article> pageLikes(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageLikes(page,article));
   }

   @Override
   public IPage<Article> pageCollect(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageCollect(page,article));
   }

   /**
    * 批量更新
    * @return
    */
   @Override
   public Boolean upcomment(String ids,String type) {
      return baseMapper.upcomment(ids,type);
   }

}