From 647454683ad143f6a2b2733f440ee6a223d92ed3 Mon Sep 17 00:00:00 2001
From: wayn <1669738430@qq.com>
Date: Tue, 3 Nov 2020 17:04:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加关键字菜单基础代码
---
 .../wayn/common/core/domain/shop/Keyword.java    | 16 +++-------------
 .../main/resources/mapper/shop/KeywordMapper.xml | 15 ++++++++-------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Keyword.java b/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Keyword.java
index f5f9cd3..819a66d 100644
--- a/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Keyword.java
+++ b/waynboot-common/src/main/java/com/wayn/common/core/domain/shop/Keyword.java
@@ -3,15 +3,15 @@ package com.wayn.common.core.domain.shop;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.wayn.common.base.entity.ShopBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
- * 关键字表
+ * 关键字表`
  * </p>
  *
  * @author wayn
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @TableName("shop_keyword")
 @EqualsAndHashCode(callSuper = false)
-public class Keyword implements Serializable {
+public class Keyword extends ShopBaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -57,16 +57,6 @@ public class Keyword implements Serializable {
      */
     private Integer sortOrder;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
     /**
      * 删除标志（0代表存在 1代表删除）
      */
diff --git a/waynboot-common/src/main/resources/mapper/shop/KeywordMapper.xml b/waynboot-common/src/main/resources/mapper/shop/KeywordMapper.xml
index dbc5b09..ad8469f 100644
--- a/waynboot-common/src/main/resources/mapper/shop/KeywordMapper.xml
+++ b/waynboot-common/src/main/resources/mapper/shop/KeywordMapper.xml
@@ -22,21 +22,22 @@
         keyword, jump_type, url, is_hot, is_default, sort_order, create_time, update_time, del_flag
         from shop_keyword
     </sql>
+
     <select id="selectKeywordListPage" resultType="com.wayn.common.core.domain.shop.Keyword">
         <include refid="selectKeywordVo"/>
         <where>
             del_flag = 0
-            <if test="keyword != null and keyword != ''">
-                AND keyword like concat('%', #{keyword}, '%')
+            <if test="keyword.keyword != null and keyword.keyword != ''">
+                AND keyword like concat('%', #{keyword.keyword}, '%')
             </if>
-            <if test="is_hot != null">
-                AND is_hot = #{isHot}
+            <if test="keyword.isHot != null">
+                AND is_hot = #{keyword.isHot}
             </if>
-            <if test="is_default != null">
-                AND is_default = #{isDefault}
+            <if test="keyword.isDefault != null">
+                AND is_default = #{keyword.isDefault}
             </if>
         </where>
-        order by sort_order desc, create_time desc
+        order by sort_order, create_time desc
 
     </select>