角色，机构禁用处理

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -205,8 +205,13 @@ public class OrgServiceImpl implements OrgService {
         }
 
         List<OrgTree> trees=orgMapper.selectTrees(org);
+        if(currentUser.getDepartmentId()==null){
+
+            trees=getOrgTreeByOrg(trees,currentUser.getCompanyId(),orgIds);
+        }{
+            trees=getOrgTreeByOrg(trees,currentUser.getDepartmentId(),orgIds);
+        }
 
-        trees=getOrgTree(trees,0,1,orgIds);
 
         return trees;
     }