From d397b54e3924c55e80782a80d9f19d616d40ccba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 16:53:40 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsCategoryController.java | 5 ++++-
1 files changed, 4 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 30087a0..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
@@ -162,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