Skip to content

S
solo-1
Commit e4495d91 authored by Liang Ding's avatar Liang Ding
Browse files
Options

🎨 Fix #12910

parent 4e437011
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/main/java/org/b3log/solo/service/ArticleQueryService.java
View file @ e4495d91
...@@ -50,7 +50,7 @@ import java.util.*; ...@@ -50,7 +50,7 @@ import java.util.*;
* @author <a href="https://hacpai.com/member/armstrong">ArmstrongCN</a> * @author <a href="https://hacpai.com/member/armstrong">ArmstrongCN</a>
* @author <a href="http://zephyr.b3log.org">Zephyr</a> * @author <a href="http://zephyr.b3log.org">Zephyr</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.3.4.0, Sep 18, 2019 * @version 1.3.4.1, Sep 20, 2019
* @since 0.3.5 * @since 0.3.5
*/ */
@Service @Service
...@@ -143,6 +143,7 @@ public class ArticleQueryService { ...@@ -143,6 +143,7 @@ public class ArticleQueryService {
CompositeFilterOperator.and(new PropertyFilter(Article.ARTICLE_STATUS, FilterOperator.EQUAL, Article.ARTICLE_STATUS_C_PUBLISHED), CompositeFilterOperator.and(new PropertyFilter(Article.ARTICLE_STATUS, FilterOperator.EQUAL, Article.ARTICLE_STATUS_C_PUBLISHED),
CompositeFilterOperator.or( CompositeFilterOperator.or(
new PropertyFilter(Article.ARTICLE_TITLE, FilterOperator.LIKE, "%" + keyword + "%"), new PropertyFilter(Article.ARTICLE_TITLE, FilterOperator.LIKE, "%" + keyword + "%"),
new PropertyFilter(Article.ARTICLE_TAGS_REF, FilterOperator.LIKE, "%" + keyword + "%"),
new PropertyFilter(Article.ARTICLE_CONTENT, FilterOperator.LIKE, "%" + keyword + "%")))). new PropertyFilter(Article.ARTICLE_CONTENT, FilterOperator.LIKE, "%" + keyword + "%")))).
addSort(Article.ARTICLE_UPDATED, SortDirection.DESCENDING).setPage(currentPageNum, pageSize); addSort(Article.ARTICLE_UPDATED, SortDirection.DESCENDING).setPage(currentPageNum, pageSize);
...@@ -529,8 +530,8 @@ public class ArticleQueryService { ...@@ -529,8 +530,8 @@ public class ArticleQueryService {
new PropertyFilter(Article.ARTICLE_STATUS, FilterOperator.EQUAL, articleStatus), new PropertyFilter(Article.ARTICLE_STATUS, FilterOperator.EQUAL, articleStatus),
CompositeFilterOperator.or( CompositeFilterOperator.or(
new PropertyFilter(Article.ARTICLE_TITLE, FilterOperator.LIKE, "%" + keyword + "%"), new PropertyFilter(Article.ARTICLE_TITLE, FilterOperator.LIKE, "%" + keyword + "%"),
new PropertyFilter(Article.ARTICLE_TAGS_REF, FilterOperator.LIKE, "%" + keyword + "%") new PropertyFilter(Article.ARTICLE_TAGS_REF, FilterOperator.LIKE, "%" + keyword + "%"),
) new PropertyFilter(Article.ARTICLE_CONTENT, FilterOperator.LIKE, "%" + keyword + "%"))
)); ));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment