用户

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/RoleTenantController.java

@@ -13,7 +13,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
@@ -128,14 +127,14 @@ public class RoleTenantController extends BaseController {
         SysRole role = roleService.getById(roleId);
 
         List<SysMenu> menus;
-        if (role.getRoleKey().equals("admin")) {
-            menus = menuService.selectMenuList(SecurityUtils.getUserId());
-        } else {
-            SysUser user = userService.getOne(Wrappers.<SysUser>lambdaQuery()
-                    .eq(SysUser::getTenantId, role.getTenantId())
-                    .eq(SysUser::getUserName, "admin"));
-            menus = menuService.selectMenuList(user.getUserId());
-        }
+        // if (role.getRoleKey().equals("admin")) {
+        //     menus = menuService.selectMenuList(SecurityUtils.getUserId());
+        // } else {
+        SysUser user = userService.getOne(Wrappers.<SysUser>lambdaQuery()
+                .eq(SysUser::getTenantId, role.getTenantId())
+                .eq(SysUser::getUserName, "admin"));
+        menus = menuService.selectMenuList(user.getUserId());
+        // }
 
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));