From 68365df5cfb06ab86cb681adbcfd2d416e1a1d0f Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Thu, 2 Dec 2021 11:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E5=AD=90=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/toesbieya/jxc/system/service/ResourceService.java | 4 ++--
 .../java/cn/toesbieya/jxc/service/sys/SysResourceService.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java
index 0cf4013..91a4080 100644
--- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java
+++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java
@@ -139,8 +139,8 @@ public class ResourceService implements ResourceApi {
             }
         }
         //2.非数据接口的节点，其父节点必须为聚合菜单
-        else if (!parentType.equals(ResourceTypeEnum.FOLDER.getCode())) {
-            return "菜单只能以聚合菜单为父节点";
+        else if (!parentType.equals(ResourceTypeEnum.ROOT.getCode()) && !parentType.equals(ResourceTypeEnum.FOLDER.getCode())) {
+            return "菜单只能以聚合菜单或顶部菜单为父节点";
         }
         return null;
     }
diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysResourceService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysResourceService.java
index 2ba7c95..53833c9 100644
--- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysResourceService.java
+++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysResourceService.java
@@ -138,8 +138,8 @@ public class SysResourceService {
             }
         }
         //2.非数据接口的节点，其父节点必须为聚合菜单
-        else if (!parentType.equals(ResourceTypeEnum.FOLDER.getCode())) {
-            return "菜单只能以聚合菜单为父节点";
+        else if (!parentType.equals(ResourceTypeEnum.ROOT.getCode()) && !parentType.equals(ResourceTypeEnum.FOLDER.getCode())) {
+            return "菜单只能以聚合菜单或顶部菜单为父节点";
         }
         return null;
     }