diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml index 4681e8ec..2681e883 100644 --- a/ghy-admin/src/main/resources/application.yaml +++ b/ghy-admin/src/main/resources/application.yaml @@ -59,7 +59,7 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss profiles: - active: druid + active: dev # 文件上传 servlet: multipart: diff --git a/ghy-admin/src/main/resources/templates/goods/category/edit.html b/ghy-admin/src/main/resources/templates/goods/category/edit.html new file mode 100644 index 00000000..e1222007 --- /dev/null +++ b/ghy-admin/src/main/resources/templates/goods/category/edit.html @@ -0,0 +1,137 @@ + + + + + + +
+
+ + + + + + + + + + + +
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsCategoryServiceImpl.java b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsCategoryServiceImpl.java index c494f3b8..2630511f 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsCategoryServiceImpl.java +++ b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsCategoryServiceImpl.java @@ -74,7 +74,7 @@ public class GoodsCategoryServiceImpl implements GoodsCategoryService { if (category == null) { return false; } - return category.getGoodsCategoryId().equals(goodsCategory.getGoodsCategoryId()); + return !category.getGoodsCategoryId().equals(goodsCategory.getGoodsCategoryId()); } @Override @@ -83,7 +83,7 @@ public class GoodsCategoryServiceImpl implements GoodsCategoryService { if (category == null) { return false; } - return category.getGoodsCategoryId().equals(goodsCategory.getGoodsCategoryId()); + return !category.getGoodsCategoryId().equals(goodsCategory.getGoodsCategoryId()); } @Override diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml index c1e7262d..615de5ea 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsCategoryMapper.xml @@ -56,6 +56,7 @@ goods_category_code = #{goodsCategoryCode}, goods_category_name = #{goodsCategoryName}, parent_category_id = #{parentCategoryId}, + category_sort = #{categorySort}, level = #{level}, type = #{type}, remark = #{remark}, @@ -79,6 +80,7 @@ goods_category_code, goods_category_name, parent_category_id, + category_sort, level, type, remark, @@ -89,6 +91,7 @@ #{goodsCategoryCode}, #{goodsCategoryName}, #{parentCategoryId}, + #{categorySort}, #{level}, #{type}, #{remark},