| 
					
				 | 
			
			
				@@ -172,7 +172,7 @@ public class OrgServiceImpl implements OrgService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public OrgTree getTrees(Org org) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<OrgTree> getTrees(Org org) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         LoginUser currentUser = UserUtil.getCurrentUser(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         org.setTenantId(currentUser.getTenantId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Set<Integer>orgIds=new HashSet<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -186,11 +186,8 @@ public class OrgServiceImpl implements OrgService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<OrgTree> trees=orgMapper.selectTrees(org); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         trees=getOrgTree(trees,0,1,orgIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        OrgTree orgTree=new OrgTree(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orgTree.setOrgs(trees); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orgTree.setOrgName("组织机构"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orgTree.setId(-1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return orgTree; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return trees; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public static List<OrgTree> getOrgTree(List<OrgTree> list, Integer id, Integer level, Set<Integer> set) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<OrgTree> temList = newArrayList(); 
			 |