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 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 orgModelList; if(StringUtils.isEmpty(parentId)){ orgModelList = Lists.newArrayList(); - parentId = VIRTUAL_TOTAL_NODE; // 生成根节点组织 SysOrgModel model = getGenOrgModel(); + parentId = model.getParentId(); orgModelList.add(model); }else{ QueryBuilder queryBuilder = new GenQueryBuilder<>(); @@ -192,9 +192,9 @@ public class SysOrgRestController extends BaseRestController orgModelList = Lists.newArrayList(); String parentId = PARENT_ID; if(isGen){ - parentId = VIRTUAL_TOTAL_NODE; // 生成根节点组织 SysOrgModel model = getGenOrgModel(); + parentId = model.getParentId(); orgModelList.add(model); }