From e9c4bbdc195c56e866298c8989ee22cc3450f9fe Mon Sep 17 00:00:00 2001
From: "DESKTOP-7M4123\\asus" <wmire.wangmingke@cqgg.local>
Date: Thu, 8 Apr 2021 11:30:35 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=90=8E=E5=8F=B0=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=AE=9A=E4=B9=89=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/assets/js/zhyd.table.js  | 19 ++++++++++++-------
 .../main/resources/templates/article/list.ftl | 15 +++++++++++++++
 .../blog/business/vo/ArticleConditionVO.java  |  1 +
 .../resources/mybatis/BizArticleMapper.xml    |  5 +++++
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/blog-admin/src/main/resources/static/assets/js/zhyd.table.js b/blog-admin/src/main/resources/static/assets/js/zhyd.table.js
index 1ceee25..97c99be 100644
--- a/blog-admin/src/main/resources/static/assets/js/zhyd.table.js
+++ b/blog-admin/src/main/resources/static/assets/js/zhyd.table.js
@@ -25,7 +25,8 @@ Table.prototype = {
         var $tablelist = $(options.tableBox);
         $tablelist.bootstrapTable('destroy').bootstrapTable({
             url: options.url,
-            method: 'post',                      //请求方式（*）
+            method:  'method' in options ? options.method : 'post',  //请求方式（*）
+            formId:  'formId' in this.options ? this.options.formId : '#form1',
             toolbar: options.showToolbar !== false ? options.toolbar ? options.toolbar : '#toolbar' : '',                //工具按钮用哪个容器
             striped: true,                      //是否显示行间隔色
             cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
@@ -208,12 +209,16 @@ Table.prototype = {
         $(options.tableBox).bootstrapTable('refresh', {url: options.url});
     },
     getSelectedIds: function () {
-        var selectedJson = this.getSelections();
-        var ids = [];
-        $.each(selectedJson, function (i) {
-            ids.push(selectedJson[i].id);
-        });
-        return ids;
+        var formdata = $(this.formId).serialize();
+        var data = formdata.split('&');
+        var parameter = {};
+        for(var i=0;i<data.length;i++) {
+            data2 = data[i].split('=');
+            parameter[data2[0]] = data2[1];
+        }
+        return {
+            ...parameter, ...params
+        };
     },
     getSelections: function () {
         var options = this.options;
diff --git a/blog-admin/src/main/resources/templates/article/list.ftl b/blog-admin/src/main/resources/templates/article/list.ftl
index e843a31..d220e2c 100644
--- a/blog-admin/src/main/resources/templates/article/list.ftl
+++ b/blog-admin/src/main/resources/templates/article/list.ftl
@@ -11,6 +11,20 @@
                 </ol>
             </@breadcrumb>
             <div class="x_panel">
+                <form class="form-inline"  id="article1" onclick="return false;">
+                    <div class="form-group">
+                        <label class="control-label">名称和描述:</label>
+                        <input class=" form-control" name="keywords"  placeholder="请输入关键字查询" value="">
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label">名称:</label>
+                        <input class="form-control" name="title"  placeholder="请输入名称关键字查询" value="">
+                    </div>
+                    <div class="form-group">
+                        <button id="search-button" class="btn btn-primary"><i class="fa fa-search"></i>查询</button>
+                    </div>
+                </form>
+
                 <div class="x_content">
                     <div class="<#--table-responsive-->">
                         <div class="btn-group hidden-xs" id="toolbar">
@@ -68,6 +82,7 @@
     $(function () {
         var options = {
             modalName: "文章",
+            formId: "#article1",
             url: "/article/list",
             getInfoUrl: "/article/get/{id}",
             removeUrl: "/article/remove",
diff --git a/blog-core/src/main/java/com/zyd/blog/business/vo/ArticleConditionVO.java b/blog-core/src/main/java/com/zyd/blog/business/vo/ArticleConditionVO.java
index a0cf4d1..431214e 100644
--- a/blog-core/src/main/java/com/zyd/blog/business/vo/ArticleConditionVO.java
+++ b/blog-core/src/main/java/com/zyd/blog/business/vo/ArticleConditionVO.java
@@ -27,5 +27,6 @@ public class ArticleConditionVO extends BaseConditionVO {
 	private Boolean original;
 	private Boolean random;
 	private List<Long> tagIds;
+	private String title;
 }
 
diff --git a/blog-core/src/main/resources/mybatis/BizArticleMapper.xml b/blog-core/src/main/resources/mybatis/BizArticleMapper.xml
index d4172af..2e94bd0 100644
--- a/blog-core/src/main/resources/mybatis/BizArticleMapper.xml
+++ b/blog-core/src/main/resources/mybatis/BizArticleMapper.xml
@@ -96,6 +96,11 @@
 				a.keywords LIKE CONCAT('%',#{keywords , jdbcType=VARCHAR},'%')
 			)
 		</if>
+		<if test="title != null and title != '' ">
+			AND (
+			a.title LIKE CONCAT('%',#{title , jdbcType=VARCHAR},'%')
+			)
+		</if>
         GROUP BY a.id
 		<choose>
 			<when test="random != null">
-- 
Gitee