From a8fb0a175ff61c82819e7da191030c2f5e90ae98 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 Aug 2021 17:10:22 +0800
Subject: [PATCH] 20210818

---
 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java
index 2b589bf..ab46636 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java
@@ -48,6 +48,18 @@
     }
 
     /**
+     * 查询商品分类--所有一级分类
+     * xzx_score_goods_category商品分类
+     */
+    @PostMapping(Constants.ADMIN_VIEW_PREFIX+"/score/goods/viewGoodsCategoryList.json")
+    @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewGoodsCategoryListVo.class)})
+    @ApiOperation(value = "商品分类管理--所有一级分类", notes = "test: 仅0有正确返回")
+    public JsonResult<List<ViewGoodsCategoryListVo>> viewGoodsCategoryList(@RequestBody ViewGoodsCategoryListDto viewGoodsCategoryListDto) {
+        List<ViewGoodsCategoryListVo> result = goodsService.viewGoodsCategoryList(viewGoodsCategoryListDto);
+        return JsonResult.success(result);
+    }
+
+    /**
      * 添加商品分类
      */
     @PostMapping(Constants.ADMIN_VIEW_PREFIX+"/score/goods/addGoodsCategory.json")
@@ -150,13 +162,16 @@
         if(!parentId.equals(scoreGoodsCategory.getParentId())){
             scoreGoodsCategory.setParentId(parentId);
         }
+        if(parentId.equals(id)){
+            return JsonResult.failMessage("父类不能为自己!");
+        }
 
         GoodsCategoryModel goodsCategoryModel = new GoodsCategoryModel();
         goodsCategoryModel.setName(name);
         goodsCategoryModel.setCategoryIden(categoryIden);
         goodsCategoryModel.setParentId(parentId);
         List<QueryGoodsCategoryListVo> maps = scoreGoodsCategoryMapper.queryGoodsCategoryList(goodsCategoryModel);
-        if(CollUtil.isNotEmpty(maps)){
+        if(CollUtil.isNotEmpty(maps) && maps.size() > 1){
             return JsonResult.failMessage("分类不能重复添加!");
         }
         goodsCategoryModel.setId(id);

--
Gitblit v1.9.1