From 4e214289ec907ecb1d14de3e6fcd17b4582257f0 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 12 Jul 2021 19:17:02 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 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