From 2620b87fd24feaa0b60cd8b529cd44c3a7557c30 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 15:59:45 +0800
Subject: [PATCH] 1、修改树形分类可以选择自己为自己的父级的bug
---
zq-erp/src/main/java/com/matrix/system/hive/action/GoodsTypeController.java | 5 ++++-
zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java | 4 ++++
zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java | 6 +++++-
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsCategoryController.java | 6 ++++++
zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java | 5 ++++-
5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java
index f41b1b5..6052076 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java
@@ -111,6 +111,10 @@
@RequestMapping(value = "/modifyDataDictionary")
public @ResponseBody
AjaxResult modifyDataDictionary(CustomerDataDictionary newDataDictionary) {
+ // 自己不能是自己的父节点
+ if (newDataDictionary.getParentId() != null && newDataDictionary.getParentId().equals(newDataDictionary.getId())) {
+ throw new GlobleException("父级不能是自己");
+ }
dataDictionaryDao.updateByModel(newDataDictionary);
return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.UPDATE_SUCCES, "数据字典");
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java
index 3811381..716ebb0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ArticleTypeController.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.StringUtils;
@@ -126,7 +127,10 @@
articleType.setParentIds(CollectionUtils.isNotEmpty(ids) ? StringUtils.collToStr(ids, ",") : null);
if (articleType.getId() != null) {
-
+ // 自己不能是自己的父节点
+ if (articleType.getParentId() != null && articleType.getParentId().equals(articleType.getId())) {
+ throw new GlobleException("父级不能是自己");
+ }
return modify(currentService, articleType, "文章类型");
} else {
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java
index 7a5e5d7..eb30467 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/DepartInfoController.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.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
@@ -58,7 +59,9 @@
public @ResponseBody AjaxResult addOrModify(SysDepartInfo departInfo) {
if (departInfo.getId() != null) {
-
+ if (departInfo.getParentId() != null && departInfo.getParentId().equals(departInfo.getId())) {
+ throw new GlobleException("父级不能是自己");
+ }
return modify(currentService, departInfo, "部门");
} else {
QueryUtil.setQueryLimit(departInfo);
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/GoodsTypeController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/GoodsTypeController.java
index 4348e50..c5ce387 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/GoodsTypeController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/GoodsTypeController.java
@@ -1,6 +1,7 @@
package com.matrix.system.hive.action;
import com.matrix.core.constance.MatrixConstance;
+import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
@@ -47,7 +48,9 @@
AjaxResult addOrModify(SysGoodsType sysGoodsType) {
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
if (sysGoodsType.getId() != null) {
-
+ if (sysGoodsType.getParentId() != null && sysGoodsType.getParentId().equals(sysGoodsType.getId())) {
+ throw new GlobleException("父级不能是自己");
+ }
return modify(currentService, sysGoodsType, "产品分类");
} else {
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