修复禁用租户某项菜单后租户依旧能看到的问题

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

 package com.dsk.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -13,11 +12,11 @@ import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.StreamUtils;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.common.utils.TreeBuildUtils;
-import com.dsk.system.domain.*;
+import com.dsk.system.domain.SysMenu;
+import com.dsk.system.domain.SysRole;
+import com.dsk.system.domain.SysRoleMenu;
 import com.dsk.system.domain.vo.MetaVo;
 import com.dsk.system.domain.vo.RouterVo;
-import com.dsk.system.domain.vo.SysTenantPackageVo;
-import com.dsk.system.domain.vo.SysTenantVo;
 import com.dsk.system.mapper.*;
 import com.dsk.system.service.ISysMenuService;
 import lombok.RequiredArgsConstructor;
@@ -154,13 +153,15 @@ public class SysMenuServiceImpl implements ISysMenuService {
         if (LoginHelper.isSuperAdmin(userId)) {
             //Sass超管
             menus = baseMapper.selectMenuTreeAll();
-        } else if (LoginHelper.isTenantAdmin()) {
-//            租户管理员
-            SysTenantVo sysTenantVo = tenantMapper.selectVoOne(new LambdaQueryWrapper<SysTenant>().eq(SysTenant::getTenantId, LoginHelper.getTenantId()));
-            SysTenantPackageVo sysTenantPackageVo = tenantPackageMapper.selectVoOne(new LambdaQueryWrapper<SysTenantPackage>().eq(SysTenantPackage::getPackageId, sysTenantVo.getPackageId()));
-            List<Long> menuIds = StringUtils.splitTo(sysTenantPackageVo.getMenuIds(), Convert::toLong);
-            menus = baseMapper.selectBatchIds(menuIds);
-        } else {
+        }
+//        else if (LoginHelper.isTenantAdmin()) {
+//            //租户管理员
+//            SysTenantVo sysTenantVo = tenantMapper.selectVoOne(new LambdaQueryWrapper<SysTenant>().eq(SysTenant::getTenantId, LoginHelper.getTenantId()));
+//            SysTenantPackageVo sysTenantPackageVo = tenantPackageMapper.selectVoOne(new LambdaQueryWrapper<SysTenantPackage>().eq(SysTenantPackage::getPackageId, sysTenantVo.getPackageId()));
+//            List<Long> menuIds = StringUtils.splitTo(sysTenantPackageVo.getMenuIds(), Convert::toLong);
+//            menus = baseMapper.selectBatchIds(menuIds);
+//        }
+        else {
             //租户下的员工
             menus = baseMapper.selectMenuTreeByUserId(userId);
         }