From dc1a4670261bc852f643d19a83ffc53eeac1b902 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 16:16:45 +0800
Subject: [PATCH] Merge branch 'hive2.0' into api

---
 zq-erp/src/main/java/com/matrix/system/common/actions/CustomerDictionaryAction.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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, "数据字典");
 

--
Gitblit v1.9.1