From 05326c94bfd175877bebba02f3f423aa096c186f Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Tue, 6 Apr 2021 11:54:51 +0800
Subject: [PATCH] up

---
 src/main/java/com/jingcheng/cms/mapper/ArticleMapper.java   | 1 +
 .../com/jingcheng/cms/service/impl/ArticleSerivceImpl.java  | 6 +++++-
 src/main/resources/mapper/ArticleMapper.xml                 | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/jingcheng/cms/mapper/ArticleMapper.java b/src/main/java/com/jingcheng/cms/mapper/ArticleMapper.java
index c15833c..40935f1 100644
--- a/src/main/java/com/jingcheng/cms/mapper/ArticleMapper.java
+++ b/src/main/java/com/jingcheng/cms/mapper/ArticleMapper.java
@@ -23,6 +23,7 @@ public interface ArticleMapper extends CommonMapper<Article> {
     List<Category> getSecondCategory(@Param("firstCategory") Long firstCategory);
 
     List<ArticleVo> searchArticleListByCondition(@Param("param") String param,
+                                                 @Param("keyword") String keyword,
                                               @Param("firstCategory") Long firstCategory,
                                               @Param("secondCategory") Long secondCategory);
 }
diff --git a/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java b/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java
index 531d447..e1b8446 100644
--- a/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java
+++ b/src/main/java/com/jingcheng/cms/service/impl/ArticleSerivceImpl.java
@@ -147,12 +147,16 @@ public class ArticleSerivceImpl implements ArticleSerive {
         Integer pageNum = jsonObject.getInteger("pageNum") == null ? 1 : jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize") == null ? 5 : jsonObject.getInteger("pageSize");
         String param = jsonObject.getString("param");
+        String keyword = jsonObject.getString("keyword");
         if (StringUtils.isNotEmpty(param)){
             param = "%" + param + "%" ;
         }
+        if (StringUtils.isNotEmpty(keyword)){
+            keyword = "%" + keyword + "%" ;
+        }
         Long firstCategory = jsonObject.getLong("firstCategory");
         Long secondCategory = jsonObject.getLong("secondCategory");
-        List<ArticleVo> CategoryList = articleMapper.searchArticleListByCondition(param,firstCategory,secondCategory);
+        List<ArticleVo> CategoryList = articleMapper.searchArticleListByCondition(param,keyword,firstCategory,secondCategory);
         JSONObject pageJson = PageUtils.page(CategoryList,pageNum,pageSize);
         return pageJson;
     }
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index af9a388..08c3ea4 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -78,7 +78,10 @@
         where
         1 = 1
         <if test="param != null and param != ''">
-            and (ar.title like #{param} OR ar.keyword like #{param} or c1.name like #{param} or c2.name like #{param} )
+            and (ar.title like #{param}  or c1.name like #{param} or c2.name like #{param} )
+        </if>
+        <if test="keyword != null and keyword != ''">
+            and ar.keyword like #{keyword}
         </if>
         <if test="firstCategory != null ">
             and ar.first_category = #{firstCategory}