From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/article/service/ArticleService.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/service/ArticleService.java b/src/main/java/org/springblade/modules/article/service/ArticleService.java
index 6ff925c..55bce36 100644
--- a/src/main/java/org/springblade/modules/article/service/ArticleService.java
+++ b/src/main/java/org/springblade/modules/article/service/ArticleService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.article.entity.Article;
+import org.springblade.modules.article.vo.ArticleVo;
 
 /**
  * @author zhongrj
@@ -16,5 +17,33 @@
 	 * @param article 资讯对象
 	 * @return
 	 */
-	IPage<Article> selectArticlePage(IPage<Article> page,Article article);
+	IPage<Article> selectArticlePage(IPage<Article> page, ArticleVo article);
+
+	/**
+	 * 查询资讯分页信息(角色权限)
+	 * @param page
+	 * @param article 资讯对象
+	 * @return
+	 */
+	IPage<Article> pageDate(IPage<Article> page, ArticleVo article);
+
+	IPage<Article> pageCollectList(IPage<Article> page, ArticleVo article);
+
+	/**
+	 * 查询资讯分页信息(角色权限)附带评论点赞数
+	 * @param page
+	 * @param article 资讯对象
+	 * @return
+	 */
+	IPage<Article> pageLikes(IPage<Article> page, ArticleVo article);
+
+	/**
+	 * 查看已收藏的资讯
+	 * @param page
+	 * @param article 资讯对象
+	 * @return
+	 */
+	IPage<Article> pageCollect(IPage<Article> page, ArticleVo article);
+
+	Boolean upcomment(String ids,String type);
 }

--
Gitblit v1.9.3