diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
index cb31a7c5..e8b71ffc 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
@@ -1,6 +1,8 @@
 package cn.axzo.tyr.client.model.permission;
 
 import cn.axzo.basics.common.model.IBaseTree;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.List;
@@ -51,21 +53,25 @@ public class PermissionPointTreeNode implements IBaseTree<PermissionPointTreeNod
     private List<PermissionPointTreeNode> children;
 
 
+    @JsonIgnore
     @Override
     public Long getNodeCode() {
         return permissionPointId;
     }
 
+    @JsonIgnore
     @Override
     public Long getParentNodeCode() {
         return parentId;
     }
 
+    @JsonIgnore
     @Override
     public List<PermissionPointTreeNode> getNodeChildren() {
         return children;
     }
 
+    @JsonIgnore
     @Override
     public void setNodeChildren(List<PermissionPointTreeNode> nodeChildren) {
         this.children = nodeChildren;
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java
index 47350d57..5fdc2ffb 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/service/SaasRoleGroupDao.java
@@ -9,6 +9,7 @@ import cn.axzo.tyr.server.repository.entity.SaasRoleGroup;
 import cn.axzo.tyr.server.repository.mapper.SaasPgroupRoleRelationMapper;
 import cn.axzo.tyr.server.repository.mapper.SaasRoleGroupMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,12 +35,14 @@ public class SaasRoleGroupDao extends ServiceImpl<SaasRoleGroupMapper, SaasRoleG
                 condition.append(" FIND_IN_SET('" + value + "', ou_type_code) OR");
             }
         }
-        return this.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(req.getIds()), BaseEntity::getId,req.getIds())
-                .in(CollectionUtils.isNotEmpty(req.getWorkspaceTypeCode()),SaasRoleGroup::getWorkspaceTypeCode,req.getWorkspaceTypeCode())
-                .last(CollectionUtils.isNotEmpty(req.getOuTypeCode())," AND (" + condition.substring(0, condition.length() - 2) + ")")
-                .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value)
-                .list();
+        LambdaQueryChainWrapper<SaasRoleGroup> eq = this.lambdaQuery()
+            .in(CollectionUtils.isNotEmpty(req.getIds()), BaseEntity::getId, req.getIds())
+            .in(CollectionUtils.isNotEmpty(req.getWorkspaceTypeCode()), SaasRoleGroup::getWorkspaceTypeCode, req.getWorkspaceTypeCode())
+            .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value);
+        if(CollectionUtils.isNotEmpty(req.getOuTypeCode())){
+            eq.last(" AND (" + condition.substring(0, condition.length() - 2) + ")");
+        }
+        return eq.list();
     }
 
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
index 491f4a38..d498cfe8 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
@@ -96,7 +96,7 @@ public class PermissionPointServiceImpl implements PermissionPointService {
                 .collect(Collectors.groupingBy(PermissionPointTreeNode::getTerminal));
         //构建workspace-terminal工作台层级
         List<BasicDictTreeResp> dictList = saasBasicDictService.getBasicDictNodeTree(DictTypeFiledEnum.TERMINAL).getData();
-        //遍历所有workspace和terminal
+        //遍历所有workspace和terminal-构建顶层两级
         List<PermissionPointTreeNode> result = new ArrayList<>();
         for (BasicDictTreeResp workspace : dictList) {
             List<BasicDictTreeResp> terminals = workspace.getChildren();
@@ -122,8 +122,6 @@ public class PermissionPointServiceImpl implements PermissionPointService {
                 result.add(workspaceNode);
             }
         }
-
-
         return result;
     }