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 @@
+
-
+
@@ -29,6 +30,12 @@
AND goods_category_code like concat('%', #{goodsCategoryCode}, '%')
+
+ AND goods_category_name LIKE concat('%', #{goodsCategoryName}, '%')
+
+
+ AND status = #{status}
+