查询机构子机构及其本身

linwei

2024-01-24 157b568be6abe0b759ab5cd3dd91ea829841cfa3

 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -99,7 +99,6 @@

   @Override
   public List<DeptVO> tree(String tenantId) {
      Long parentId = null;
      Long id = null;
      // 判断数据权限控制,非超管角色只可看到本级及以下数据
//      if (!AuthUtil.isAdministrator()) {
@@ -120,7 +119,7 @@
         id = Func.firstLong(AuthUtil.getDeptId());
      }

      return ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId, id));
      return ForestNodeMerger.merge(baseMapper.tree(tenantId, id));
   }

   @Override