完善租户管理员权限

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java

@@ -35,6 +35,8 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
         // 管理员拥有所有权限
         if (LoginHelper.isSuperAdmin(userId)) {
             roles.add(TenantConstants.SUPER_ADMIN_ROLE_KEY);
+        } else if (LoginHelper.isTenantAdmin(roleService.selectRolePermissionByUserId(userId))) {
+            roles.add(TenantConstants.TENANT_ADMIN_ROLE_KEY);
         } else {
             roles.addAll(roleService.selectRolePermissionByUserId(userId));
         }
@@ -51,7 +53,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
     public Set<String> getMenuPermission(Long userId) {
         Set<String> perms = new HashSet<>();
         // 管理员拥有所有权限
-        if (LoginHelper.isSuperAdmin(userId)) {
+        if (LoginHelper.isSuperAdmin(userId) || LoginHelper.isTenantAdmin(roleService.selectRolePermissionByUserId(userId))) {
             perms.add("*:*:*");
         } else {
             perms.addAll(menuService.selectMenuPermsByUserId(userId));