linwei
2024-01-26 016e47ea961d84a186db0bbd45cd6d7eaaa57bc3
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -99,28 +99,13 @@
   @Override
   public List<DeptVO> tree(String tenantId) {
      Long parentId = null;
      Long id = null;
      // 判断数据权限控制,非超管角色只可看到本级及以下数据
//      if (!AuthUtil.isAdministrator()) {
//         Long deptId = Func.firstLong(AuthUtil.getDeptId());
//         Dept dept = SysCache.getDept(deptId);
//         if (dept.getParentId() != 0) {
//            parentId = dept.getParentId();
//         }
//         List<DeptVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId));
//         List<DeptVO> copy = BeanUtil.copy(merge, DeptVO.class);
//         copy = copy.stream().filter(item -> AuthUtil.getDeptId().contains(item.getId().toString())).collect(Collectors.toList());
//         return copy;
//      }
      String userRole = AuthUtil.getUserRole();
      // 判断物业公司
      if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
         // 获取当前用户的机构
      if (!AuthUtil.isAdmin()) {
         id = Func.firstLong(AuthUtil.getDeptId());
      }
      return ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId, id));
      List<DeptVO> tree = baseMapper.tree(tenantId, id);
      return ForestNodeMerger.merge(tree);
   }
   @Override
@@ -136,7 +121,7 @@
//            parentId = dept.getParentId();
//         }
//      }
      if (Func.toLong(parentId) == 0L && !AuthUtil.isAdministrator()) {
      if (Func.toLong(parentId) == 0L && !AuthUtil.isAdmin()) {
         Long deptId = Func.firstLong(AuthUtil.getDeptId());
         Dept dept = SysCache.getDept(deptId);
         if (dept.getParentId() != 0) {