diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java
index f5fc6db7..aaf58537 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarModelTree.controller;
 
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarModelTree.entity.SarModuleTree;
 import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
 import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
@@ -38,17 +39,18 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
     @ApiOperation("查询父所有资源")
     @GetMapping("/list")
     public ResponseMessage<List<SarModelTree>> getAll(){
-        List<SarModelTree> tsResources = iSarModelTreeService.getAll(null);
-//        TODO List<SarModelTree> tsResources = iSarModuleTreeService.getAll(null);
+//        List<SarModuleTree> tsResources = iSarModuleTreeService.getAll(null);
+         List<SarModelTree> tsResources = iSarModelTreeService.getAll(null);
         return Result.success(tsResources);
     }
 
     @ApiOperation("根据父ID查询子所有资源")
     @GetMapping("/childByList")
-    public ResponseMessage<List<SarModelTree>> childByList(String ids){
-        SarModelTree tree = new SarModelTree();
-        tree.setId(ids);
-        List<SarModelTree> tsResources = iSarModelTreeService.recursionGetChildren(tree);
+    public ResponseMessage<List<SarModelTree>> childByList(SarModelTree parentTree){
+//        List<SarModuleTree> tsResources = iSarModuleTreeService.recursionGetChildren(parentTree);
+
+        List<SarModelTree> tsResources = iSarModelTreeService.recursionGetChildren(parentTree);
+
         return Result.success(tsResources);
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
index cbdd10d2..0b68d34a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author super_liu
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java
index 95dcdca1..227dc6d1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java
@@ -70,7 +70,13 @@ public class SarModuleTree {
   @TableField("CREATIONDATE")
   private String creationdate;
 
+  @TableField(exist = false)
+  private Integer level;
 
+  @TableField(exist = false)
+  private String model;
 
+  @TableField(exist = false)
+  private String nextCondition;
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java
index f84026c1..44254478 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java
@@ -1,15 +1,16 @@
 package com.adc.da.slrs.sarModelTree.service;
 
 import com.adc.da.slrs.sarModelTree.entity.SarModelTree;
+import com.adc.da.slrs.sarModelTree.entity.SarModuleTree;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 
 import java.util.List;
 
 public interface ISarModuleTreeService {
 
-    List<SarModelTree> getAll(SarModelTree sarModelTree);
+    List<SarModuleTree> getAll(SarModuleTree root);
 
-    List<SarModelTree> recursionGetChildren(SarModelTree parent);
+    List<SarModuleTree> recursionGetChildren(SarModuleTree parent);
 
     public Head analysisJsonAndStorage(String json);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
index a9703566..0635dd2d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
@@ -32,6 +32,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
 //        for(SarModelTree tree:list){
 //            tree.setChildren(recursionGetChildren((tree)));
 //        }
+        list.forEach(item->{
+            item.setId(item.getName());
+        });
         return list;
     }
 
@@ -44,11 +47,16 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
     public List<SarModelTree> recursionGetChildren(SarModelTree parent){
         QueryWrapper<SarModelTree> sarMenuQueryWrapper=new QueryWrapper<>();
         sarMenuQueryWrapper.orderByAsc("SORT");
-        sarMenuQueryWrapper.in("PID",parent.getId());
+//        sarMenuQueryWrapper.in("PID",parent.getId());
+        sarMenuQueryWrapper.eq("PID",parent.getId());
         List<SarModelTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
-        for(SarModelTree sarMenu:children){
-            sarMenu.setChildren(recursionGetChildren((sarMenu)));
-        }
+//        for(SarModelTree sarMenu:children){
+//            sarMenu.setChildren(recursionGetChildren((sarMenu)));
+//        }
+
+        children.forEach(item->{
+            item.setId(item.getName());
+        });
         return children;
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java
index 553be0fb..e5119153 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java
@@ -15,9 +15,11 @@ import com.google.gson.JsonParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.awt.event.MouseAdapter;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 @Service
@@ -27,16 +29,27 @@ public class SarModuleTreeServiceImpl extends ServiceImpl<SarModuleTreeDao, SarM
     private SarModuleTreeServiceImpl  sarModuleTreeService;
 
     /**
-     * @param sarModelTree
      * @return 所有的根节点
      */
     @Override
-    public List<SarModelTree> getAll(SarModelTree sarModelTree) {
+    public List<SarModuleTree> getAll(SarModuleTree root) {
         QueryWrapper<SarModuleTree> treeQueryWrapper = new QueryWrapper<>();
-        treeQueryWrapper.groupBy("FTVSTYPE1");
-        List<SarModuleTree> moduleTreeList = this.baseMapper.selectList(treeQueryWrapper);
+        treeQueryWrapper.select("FTVSTYPE1")
+                .groupBy("FTVSTYPE1");
+
+        List<Map<String, Object>> moduleTreeList = this.baseMapper.selectMaps(treeQueryWrapper);
+
+        List<SarModuleTree> collect = moduleTreeList.stream()
+                .map(item -> {
+                    SarModuleTree sarModuleTree = new SarModuleTree();
+                    sarModuleTree.setNextCondition(item.get("FTVSTYPE1").toString());
+                    sarModuleTree.setLevel(1);
+                    sarModuleTree.setModel(item.get("FTVSTYPE1").toString());
+                    return sarModuleTree;
+                }).collect(Collectors.toList());
+
         //返回转换元素后的数组
-        return listTransform(moduleTreeList);
+        return collect;
     }
 
     /**
@@ -45,20 +58,47 @@ public class SarModuleTreeServiceImpl extends ServiceImpl<SarModuleTreeDao, SarM
      * @return
      */
     @Override
-    public List<SarModelTree> recursionGetChildren(SarModelTree parent) {
+    public List<SarModuleTree> recursionGetChildren(SarModuleTree parent) {
 
         QueryWrapper<SarModuleTree> treeQueryWrapper = new QueryWrapper<>();
-        treeQueryWrapper.eq("GUID",parent.getId());
-        List<SarModuleTree> moduleTreeList = this.baseMapper.selectList(treeQueryWrapper);
+        Integer level =parent.getLevel();
+
+        switch (parent.getLevel()){
+            case 1:
+                level=2;
+                break;
+            case 6:
+                return null;
+        }
+
+        String column="FTVSTYPE"+(level+1);
+
+        treeQueryWrapper.select(column)
+                .eq("FTVSTYPE"+parent.getLevel(),parent.getNextCondition())
+                .groupBy(column);
+
+        List<Map<String, Object>> moduleTreeList = this.baseMapper.selectMaps(treeQueryWrapper);
+
+        Integer finalLevel = level;
+        List<SarModuleTree> collect = moduleTreeList.stream()
+                .map(item -> {
+                    SarModuleTree sarModuleTree = new SarModuleTree();
+                    sarModuleTree.setNextCondition(item.get(column).toString()); //查询子节点条件
+                    sarModuleTree.setLevel(finalLevel + 1);
+                    //拼接前端显示名称
+//                    switch (finalLevel){
+//                        case 3:
+//                            sarModuleTree.setModel(item.get(column).toString());//前端显示名称
+//                            break;
+//                        case
+//                    }
 
 
-        Map<String, List<SarModuleTree>> collect = moduleTreeList.stream().collect(Collectors.groupingBy(SarModuleTree::getFtvstype1));
-        collect.forEach((k, v)->{
-            SarModelTree modelTree = new SarModelTree();
-            //TODO 生成树型结构
-//            modelTree
-        });
-        return null;
+                    return sarModuleTree;
+                }).collect(Collectors.toList());
+
+
+        return collect;
     }
 
     @Override
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java
index a05e6b92..8e31ac90 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java
@@ -74,6 +74,9 @@ public class SarVppsTree extends BaseEntity {
     @TableField("TYPE")
     private String type;
 
+    @ApiModelProperty("查询子节点条件")
+    @TableField(exist = false)
+    private String nextCondition;
 
     @TableField(exist=false)
     private List<String> roleIds;
@@ -82,4 +85,6 @@ public class SarVppsTree extends BaseEntity {
     private List<String> childMenuIds;
 
 
+
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
index 7f9f4028..f5986c6d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
@@ -31,7 +31,10 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
                 .eq("LEVEL",0);
         List<SarVppsTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
 
-        list.forEach(item->item.setVppsCode("10"));
+        list.forEach(item->{
+            item.setCode(item.getVppsCode()+item.getChineseName());
+            item.setId("10");
+        });
 //        for(SarVppsTree tree:list){
 //            tree.setChildren(recursionGetChildren((tree)));
 //        }
@@ -47,14 +50,16 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
     public List<SarVppsTree> recursionGetChildren(SarVppsTree parent){
         QueryWrapper<SarVppsTree> sarMenuQueryWrapper=new QueryWrapper<>();
         sarMenuQueryWrapper.orderByAsc("SORT");
-//        sarMenuQueryWrapper.in("PID",parent.getId());
+
         sarMenuQueryWrapper.eq("LEVEL", parent.getLevel()+1)
                 .eq("TYPE",parent.getType())
-                .like("VPPS_CODE",parent.getVppsCode());
+                .like("VPPS_CODE",parent.getId());
         List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
-//        for(SarVppsTree sarMenu:children){
-//            sarMenu.setChildren(recursionGetChildren((sarMenu)));
-//        }
+
+        children.forEach(item->{
+            item.setId(item.getVppsCode());
+            item.setCode(item.getVppsCode()+item.getChineseName());
+        });
         return children;
     }
 }