fix: 修复多租户权限系统接口问题 - 新增 /tenant/active 路由 - ByTenant 接口支持 tenantId=0 返回全局角色 - 修复数据库缺少 t_role.tenant_id / t_tenant.expired_at|menu_keys / t_audit_log.action_type 等字段

Author: pythonHuang

Juggle.Api/Controllers/Api/RoleController.cs

@@ -72,6 +72,17 @@ public async Task<ApiResult> All()
     [HttpGet("byTenant/{tenantId}"), Authorize]
     public async Task<ApiResult> ByTenant(long tenantId)
     {
+        // tenantId=0 时返回全局角色（无租户绑定）
+        if (tenantId == 0)
+        {
+            var globalList = await _db.Roles
+                .Where(r => r.Deleted == 0 && r.TenantId == null)
+                .OrderBy(r => r.Id)
+                .Select(r => new { r.Id, r.RoleName, r.RoleCode, r.TenantId })
+                .ToListAsync();
+            return ApiResult.Success(globalList);
+        }
+
         // 超管可获取指定租户下所有角色
         // 非超管只能获取本租户的角色
         if (!_tenant.IsSuperAdmin && tenantId != _tenant.TenantId)

Juggle.Api/Controllers/Api/TenantController.cs

@@ -78,6 +78,18 @@ public async Task<ApiResult> All()
         return ApiResult.Success(list);
     }
 
+    /// <summary>所有启用租户（下拉选择用，兼容前端 /active 路由）</summary>
+    [HttpGet("active"), Authorize]
+    public async Task<ApiResult> Active()
+    {
+        var list = await _db.Tenants
+            .Where(t => t.Deleted == 0 && t.Status == 1)
+            .OrderBy(t => t.Id)
+            .Select(t => new { t.Id, t.TenantName, t.TenantCode })
+            .ToListAsync();
+        return ApiResult.Success(list);
+    }
+
     /// <summary>租户详情（含菜单权限和关联用户）</summary>
     [HttpGet("detail/{id}"), Authorize]
     public async Task<ApiResult> Detail(long id)