租户

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

@@ -13,6 +13,7 @@ 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;
@@ -125,10 +126,16 @@ public class RoleTenantController extends BaseController {
     @GetMapping(value = "/roleMenuTreeSelect/{roleId}")
     public AjaxResult roleMenuTreeSelect(@PathVariable("roleId") Long roleId) {
         SysRole role = roleService.getById(roleId);
-        SysUser user = userService.getOne(Wrappers.<SysUser>lambdaQuery()
-                .eq(SysUser::getTenantId, role.getTenantId())
-                .eq(SysUser::getUserName, "admin"));
-        List<SysMenu> menus = menuService.selectMenuList(user.getUserId());
+
+        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());
+        }
 
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));