Administrator
2021-07-16 269031cf8e6d1e4643e1be2b822bbfebcf87ea4b
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
@@ -69,13 +69,13 @@
   }
   @Override
   public List<RoleVO> tree(String tenantId) {
   public List<RoleVO> tree(String tenantId,Long deptId) {
      String userRole = AuthUtil.getUserRole();
      String excludeRole = null;
      if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) {
         excludeRole = RoleConstant.ADMIN;
      }
      return ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
      return ForestNodeMerger.merge(baseMapper.tree(tenantId,deptId, excludeRole));
   }
   @Override