From 6a0f942ac908a4b0b149b00e2aebaa3f36af943d Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Fri, 13 May 2022 09:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=B1=BB=E7=9B=AE=E8=A1=A8Ma?=
 =?UTF-8?q?pper=E7=BC=BA=E5=B0=91=E4=BA=86category=5Fsort=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/goods/deptcategory/deptcategory.html     | 10 +++++-----
 .../resources/mapper/goods/GoodsCategoryMapper.xml     |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
index f87be522..f43bd9ad 100644
--- a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
+++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
@@ -87,11 +87,11 @@
                     title: '三级分销扣点',
                     align: "left"
                 },
-                {
-                    field: 'categorySort',
-                    title: '排序',
-                    align: "left"
-                },
+                // {
+                //     field: 'categorySort',
+                //     title: '排序',
+                //     align: "left"
+                // },
                 {
                     field: 'status',
                     title: '状态',
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml
index 0be985bd..71371548 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml
@@ -7,9 +7,10 @@
         <result property="goodsCategoryCode"   column="goods_category_code"     />
         <result property="goodsCategoryName"   column="goods_category_name"     />
         <result property="parentCategoryId"    column="parent_category_id"     />
+        <result property="categorySort"        column="category_sort"/>
         <result property="level"               column="level"     />
         <result property="type"                column="type"     />
-        <result property="status"                column="status"     />
+        <result property="status"              column="status"     />
         <result property="createBy"            column="create_by"     />
         <result property="createTime"          column="create_time"   />
         <result property="updateBy"            column="update_by"     />
@@ -29,6 +30,12 @@
             <if test="goodsCategoryCode != null and goodsCategoryCode != ''">
                 AND goods_category_code like concat('%', #{goodsCategoryCode}, '%')
             </if>
+            <if test="goodsCategoryName != null and goodsCategoryName != ''">
+                AND goods_category_name LIKE concat('%', #{goodsCategoryName}, '%')
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
         </where>
     </select>