guoshilong
2023-05-15 a8d11819563fcd3d237f354574ccadb92ccf57e4
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java
@@ -71,6 +71,10 @@
      if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
         parentId = null;
      }
      // 如果不是超级管理员
      if (!AuthUtil.isAdministrator()){
         param.put("super",1);
      }
      return baseMapper.lazyList(parentId, param);
   }
@@ -146,7 +150,12 @@
   @Override
   public List<TreeNode> grantTree(BladeUser user) {
      List<TreeNode> menuTree = user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
      Map<String, Object> param = new HashMap<>(1);
      // 如果不是超级管理员
      if(!AuthUtil.isAdministrator()){
         return ForestNodeMerger.merge(tenantPackageTree(baseMapper.grantTreeNew(), user.getTenantId()));
      }
      List<TreeNode> menuTree = user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTree(param) : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
      return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
   }