From 058361ab0233f5e7d5dd4d6f674137432dd8d063 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Apr 2021 17:58:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
index b141bdd..ddf679b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.action;
+import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -45,6 +46,11 @@
AjaxResult addOrModify(ShoppingGoodsCategory shoppingGoodsCategory) {
if (shoppingGoodsCategory.getId() != null) {
+ // 自己不能是自己的父节点
+ if (shoppingGoodsCategory.getParentId() != null && shoppingGoodsCategory.getParentId().equals(shoppingGoodsCategory.getId())) {
+ throw new GlobleException("父级不能是自己");
+ }
+
return modify(goodsCategoryService, shoppingGoodsCategory, "商品类型");
} else {
QueryUtil.setQueryLimit(shoppingGoodsCategory);
--
Gitblit v1.9.1