From 2c6d90420179ad39b96189ea9703321e34a25ee4 Mon Sep 17 00:00:00 2001
From: Carina <meet.carina@foxmail.com>
Date: Fri, 25 Jun 2021 16:56:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD=E6=A0=B9=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opsli/modulars/system/menu/web/MenuRestController.java    | 2 ++
 .../opsli/modulars/system/org/web/SysOrgRestController.java   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java
index 2289d9d6..4514c32b 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/web/MenuRestController.java
@@ -165,6 +165,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
             menuModelList = Lists.newArrayList();
             // 生成根节点菜单
             MenuModel model = getGenMenuModel();
+            parentId = model.getParentId();
             menuModelList.add(model);
         }else{
             // 只查菜单
@@ -209,6 +210,7 @@ public class MenuRestController extends BaseRestController<SysMenu, MenuModel, I
             menuModelList = Lists.newArrayList();
             // 生成根节点菜单
             MenuModel model = getGenMenuModel();
+            parentId = model.getParentId();
             menuModelList.add(model);
         }else{
             QueryBuilder<SysMenu> queryBuilder = new GenQueryBuilder<>();
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
index 43504afa..908f9ef2 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
@@ -156,9 +156,9 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
         List<SysOrgModel> orgModelList;
         if(StringUtils.isEmpty(parentId)){
             orgModelList = Lists.newArrayList();
-            parentId = VIRTUAL_TOTAL_NODE;
             // 生成根节点组织
             SysOrgModel model = getGenOrgModel();
+            parentId = model.getParentId();
             orgModelList.add(model);
         }else{
             QueryBuilder<SysOrg> queryBuilder = new GenQueryBuilder<>();
@@ -192,9 +192,9 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
         List<SysOrgModel> orgModelList = Lists.newArrayList();
         String parentId = PARENT_ID;
         if(isGen){
-            parentId = VIRTUAL_TOTAL_NODE;
             // 生成根节点组织
             SysOrgModel model = getGenOrgModel();
+            parentId = model.getParentId();
             orgModelList.add(model);
         }