🍒 perf(Core): 移除视图，改由缓存管理权限相关数据

Admin.NET/Admin.NET.Core/Const/CacheConst.cs

@@ -11,6 +11,11 @@ namespace Admin.NET.Core;
 /// </summary>
 public class CacheConst
 {
+    /// <summary>
+    /// 接口信息缓存
+    /// </summary>
+    public const string KeyAllApi = "sys_all_api";
+
     /// <summary>
     /// 用户会话缓存
     /// </summary>

Admin.NET/Admin.NET.Core/Entity/SysApiInfo.cs

@@ -1,63 +0,0 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// 系统接口信息表
-/// </summary>
-[SysTable]
-[SugarTable(null, "系统接口信息表")]
-public partial class SysApiInfo : EntityBaseId
-{
-    /// <summary>
-    /// 组名
-    /// </summary>
-    [SugarColumn(ColumnDescription = "组名", Length = 64)]
-    public string? GroupName { get; set; }
-
-    /// <summary>
-    /// 路由名
-    /// </summary>
-    [SugarColumn(ColumnDescription = "路由名", Length = 64)]
-    public string? Name { get; set; }
-
-    /// <summary>
-    /// 描述
-    /// </summary>
-    [SugarColumn(ColumnDescription = "描述", Length = 64)]
-    public string? Desc { get; set; }
-
-    /// <summary>
-    /// 路由
-    /// </summary>
-    [SugarColumn(ColumnDescription = "路由", Length = 64)]
-    public string Route { get; set; }
-
-    /// <summary>
-    /// 控制器名称
-    /// </summary>
-    [SugarColumn(ColumnDescription = "控制器名称", Length = 64)]
-    public string Action { get; set; }
-
-    /// <summary>
-    /// 请求方式
-    /// </summary>
-    [SugarColumn(ColumnDescription = "请求方式", Length = 16)]
-    public string HttpMethod { get; set; }
-
-    /// <summary>
-    /// 是否移动端接口
-    /// </summary>
-    [SugarColumn(ColumnDescription = "是否移动端接口")]
-    public bool IsAppApi { get; set; }
-
-    /// <summary>
-    /// 排序
-    /// </summary>
-    [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
-}

Admin.NET/Admin.NET.Core/Entity/VSysPermissions.cs

@@ -1,58 +0,0 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// 系统权限标识视图
-/// </summary>
-[SugarTable(null, "系统权限标识视图"), IgnoreTable]
-public class VSysPermissions : ISqlSugarView
-{
-    /// <summary>
-    /// 来自菜单标识
-    /// </summary>
-    [SugarColumn(ColumnDescription = "来自菜单标识")]
-    public long MenuId { get; set; }
-
-    /// <summary>
-    /// 状态
-    /// </summary>
-    [SugarColumn(ColumnDescription = "状态")]
-    public StatusEnum Status { get; set; }
-
-    /// <summary>
-    /// 权限标识
-    /// </summary>
-    [SugarColumn(ColumnDescription = "权限标识", IsPrimaryKey = true)]
-    public string Permission { get; set; }
-
-    /// <summary>
-    /// 视图语句
-    /// </summary>
-    public string GetQueryableSqlString(SqlSugarScopeProvider db)
-    {
-        return db.Union(
-            db.Queryable<SysMenu>()
-            .Where(u => u.Type == MenuTypeEnum.Btn && u.Status == StatusEnum.Enable && !string.IsNullOrWhiteSpace(u.Permission))
-            .Select(u => new VSysPermissions
-            {
-                MenuId = u.Id,
-                Status = u.Status,
-                Permission = u.Permission
-            }),
-            db.Queryable<SysApiInfo>()
-                .Where(u => !string.IsNullOrWhiteSpace(u.Route) && SqlFunc.Subqueryable<SysMenu>().Where(z => z.Permission == u.Route).NotAny())
-                .Select(u => new VSysPermissions
-                {
-                    MenuId = 0,
-                    Status = StatusEnum.Enable,
-                    Permission = u.Route,
-                }).Distinct())
-            .OrderBy(u => u.Permission)
-            .ToMappedSqlString();
-    }
-}

Admin.NET/Admin.NET.Core/Entity/VSysUserOrg.cs

@@ -1,82 +0,0 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// 系统用户机构视图
-/// </summary>
-[SugarTable(null, "系统用户机构视图"), IgnoreTable]
-public class VSysUserOrg : ISqlSugarView
-{
-    /// <summary>
-    /// 用户Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "用户Id")]
-    public long UserId { get; set; }
-
-    /// <summary>
-    /// 机构Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "机构Id")]
-    public long OrgId { get; set; }
-
-    /// <summary>
-    /// 视图语句
-    /// </summary>
-    public string GetQueryableSqlString(SqlSugarScopeProvider db)
-    {
-        return db.Union(
-            // 获取用户表中的机构Id
-            db.Queryable<SysUser>().IgnoreTenant()
-            .Select(u => new VSysUserOrg
-            {
-                UserId = u.Id,
-                OrgId = u.OrgId
-            }),
-            // 获取用户创建的机构Id
-            db.Queryable<SysOrg>().IgnoreTenant()
-                .Where(u => u.CreateUserId != null)
-                .Select(u => new VSysUserOrg
-                {
-                    UserId = u.CreateUserId.Value,
-                    OrgId = u.Id
-                }),
-            // 获取用户扩展机构Id
-            db.Queryable<SysUserExtOrg>()
-                .Select(u => new VSysUserOrg
-                {
-                    UserId = u.UserId,
-                    OrgId = u.OrgId
-                }),
-            // 获取用户角色关联的机构Id
-            db.Queryable<SysRoleOrg>()
-                .InnerJoin<SysUserRole>((u, a) => u.RoleId == a.RoleId)
-                .Select((u, a) => new VSysUserOrg
-                {
-                    UserId = a.UserId,
-                    OrgId = u.OrgId
-                }),
-            // 获取包含全部数据权限的机构Id
-            db.Queryable<SysOrg>().IgnoreTenant()
-                .FullJoin<SysUserRole>((u, a) => a.SysRole.DataScope == DataScopeEnum.All)
-                .Select((u, a) => new VSysUserOrg
-                {
-                    UserId = a.UserId,
-                    OrgId = u.Id
-                }),
-            // 超管获取全部机构Id
-            db.Queryable<SysOrg>().IgnoreTenant()
-                    .FullJoin<SysUser>((u, a) => a.AccountType == AccountTypeEnum.SuperAdmin)
-                    .Select((u, a) => new VSysUserOrg
-                    {
-                        UserId = a.Id,
-                        OrgId = u.Id
-                    }))
-            .Where(u => u.OrgId != null && u.OrgId != 0)
-            .ToMappedSqlString();
-    }
-}

Admin.NET/Admin.NET.Core/Job/StartHostedService.cs

@@ -41,13 +41,6 @@ public class StartHostedService(IServiceScopeFactory serviceScopeFactory) : IHos
             Console.WriteLine(message);
             Log.Information(message);
 
-            // 持久化系统接口数据
-            var sysAuthService = serviceScope.ServiceProvider.GetRequiredService<SysAuthService>();
-            await sysAuthService.ResetSysApiInfo();
-            message = $"【启动任务】持久化系统接口数据 {DateTime.Now}";
-            Console.WriteLine(message);
-            Log.Information(message);
-
             Console.ForegroundColor = originColor;
         }, cancellationToken);
     }

Admin.NET/Admin.NET.Core/Logging/ElasticSearchLoggingWriter.cs

@@ -42,7 +42,7 @@ public class ElasticSearchLoggingWriter : IDatabaseLoggingWriter, IDisposable
             return;
 
         // 获取当前操作者
-        var userManager = LazyHelper.GetService<UserManager>().Value;
+        var userManager = LazyHelper.GetService<UserManager>();
         string account = "", realName = "", userId = "", tenantId = "";
         if (loggingMonitor.authorizationClaims != null)
         {
@@ -51,7 +51,7 @@ public class ElasticSearchLoggingWriter : IDatabaseLoggingWriter, IDisposable
             {
                 if (item.type != ClaimConst.UserId) continue;
                 userId = item.value;
-                userSession = userManager.GetSessionOrRefresh(userId);
+                userSession = userManager.Value.GetSessionOrRefresh(userId);
                 break;
             }
             tenantId = userSession?.TenantId.ToString();

Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -294,28 +294,16 @@ public class SysAuthService : IDynamicApiController, ITransient
         user.SysPos ??= await db.Queryable<SysPos>().FirstAsync(u => u.Id == user.PosId);
         user.SysOrg ??= await db.Queryable<SysOrg>().FirstAsync(u => u.Id == user.OrgId);
 
-        var orgIds = await db.Queryable<VSysUserOrg>().Where(u => u.UserId == user.Id).Select(u => u.OrgId).ToListAsync();
         var roleIds = await db.Queryable<SysRole>().InnerJoinIF<SysUserRole>(user.AccountType != AccountTypeEnum.SuperAdmin, (u, a) => a.RoleId == u.Id && a.UserId == user.Id).Select((u, a) => u.Id).ToListAsync();
         var posIds = await db.Queryable<SysPos>().InnerJoinIF<SysUserExtOrg>(user.AccountType != AccountTypeEnum.SuperAdmin, (u, a) => a.PosId == u.Id && a.UserId == user.Id).Select((u, a) => u.Id).ToListAsync();
         posIds = posIds.Concat([user.PosId]).Where(u => u != 0).ToList();
 
-        var maxDataScope = await db.Queryable<SysRole>().Where(u => roleIds.Contains(u.Id)).MinAsync(u => u.DataScope);
+        var maxDataScope = await db.Queryable<SysRole>().Where(u => roleIds.Contains(u.Id)).Select(u => u.DataScope).ToListAsync();
-        if (maxDataScope == 0) maxDataScope = DataScopeEnum.Self;
+        if (!maxDataScope.Any()) maxDataScope = [DataScopeEnum.Self];
 
-        var permissions = user.AccountType != AccountTypeEnum.SuperAdmin ? await db.Queryable<VSysPermissions>()
+        var orgIds = GetUserOrgIdList(user, roleIds);
-            .InnerJoin<SysRoleMenu>((u, a) => roleIds.Contains(a.RoleId) && u.MenuId == a.MenuId)
+        var permissions =  GetUserPermissions(user, roleIds);
-            .InnerJoin<SysRoleApi>((u, a, b) => u.Permission != b.Route)
+        var unauthorizedPermissions =  GetUserUnPermissions(user, roleIds);
-            .Select(u => u.Permission)
-            .ToListAsync()
-            : await db.Queryable<VSysPermissions>().Select(u => u.Permission).ToListAsync();
-
-        var unauthorizedPermissions = user.AccountType != AccountTypeEnum.SuperAdmin ? await db.Union(
-            db.Queryable<SysRoleApi>().Where(u => roleIds.Contains(u.RoleId)).Select(u => u.Route),
-            db.Queryable<VSysPermissions>().Where(u => u.MenuId != 0 && SqlFunc.Subqueryable<SysRoleMenu>()
-                    .Where(z => roleIds.Contains(z.RoleId) && z.MenuId == u.MenuId).NotAny())
-                .Select(u => u.Permission)
-            ).ToListAsync()
-                : [];
 
         // 缓存用户Session
         _userManager.SetSession(new()
@@ -341,8 +329,8 @@ public class SysAuthService : IDynamicApiController, ITransient
             RoleIds = roleIds,
             Permissions = permissions,
             UnauthorizedPermissions = unauthorizedPermissions,
+            DataScopeList = user.AccountType == AccountTypeEnum.SuperAdmin ? [DataScopeEnum.All] : maxDataScope,
             AppPermissions = loginMode == LoginModeEnum.APP ? LazyHelper.GetService<SysCommonService>().Value.GetAppApiList() : null,
-            MaxDataScope = user.AccountType == AccountTypeEnum.SuperAdmin ? DataScopeEnum.All : maxDataScope,
             ExtProps = App.GetServices<IUserSessionExtProps>().SelectMany(u => u.GetInitExtProps(user)).ToDictionary(u => u.Key, u => u.Value)
         });
     }
@@ -496,24 +484,14 @@ public class SysAuthService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 刷新Session
+    /// 获取系统所有接口列表
-    /// </summary>
-    /// <param name="userId"></param>
-    [NonAction]
-    public async Task RefreshSession(long userId)
-    {
-        var user = await _sysUserRep.AsQueryable().IgnoreTenant().Includes(u => u.SysOrg).FirstAsync(u => u.Id == userId);
-        await SetUserSession(user, CommonHelper.IsMobile(_httpContextAccessor.HttpContext?.Request.Headers.UserAgent ?? "") ? LoginModeEnum.APP : LoginModeEnum.PC);
-    }
-
-    /// <summary>
-    /// 重置系统接口信息
     /// </summary>
     [NonAction]
-    public async Task ResetSysApiInfo()
+    public List<ApiOutput> GetSysAllApiInfoList()
     {
-        var id = SqlSugarConst.DefaultTenantId + 10000000000;
+        return _sysCacheService.GetOrAdd(CacheConst.KeyAllApi, _ =>
-        var apiList = new List<SysApiInfo>();
+        {
+            var apiList = new List<ApiOutput>();
             var apiDescriptionGroups = _apiProvider.ApiDescriptionGroups.Items;
             foreach (ApiDescriptionGroup group in apiDescriptionGroups)
             {
@@ -536,16 +514,14 @@ public class SysAuthService : IDynamicApiController, ITransient
                             case ApiDescriptionSettingsAttribute settings:
                                 if (!string.IsNullOrWhiteSpace(settings.GroupName)) groupName = settings.GroupName;
                                 break;
-
                             case DisplayNameAttribute displayName:
                                 if (!string.IsNullOrWhiteSpace(displayName.DisplayName)) displayText = displayName.DisplayName;
                                 break;
                         }
                     }
 
-                apiList.Add(new SysApiInfo
+                    apiList.Add(new ApiOutput
                     {
-                    Id = id++,
                         Route = route,
                         HttpMethod = action.HttpMethod,
                         Order = apiDescription?.Order ?? 0,
@@ -557,8 +533,115 @@ public class SysAuthService : IDynamicApiController, ITransient
                     });
                 }
             }
+            return apiList;
+        });
+    }
 
-        await _sysUserRep.Context.Deleteable<SysApiInfo>().ExecuteCommandAsync();
+    /// <summary>
-        await _sysUserRep.Context.Insertable(apiList).ExecuteCommandAsync();
+    /// 获取用户权限
+    /// </summary>
+    /// <param name="user"></param>
+    /// <param name="roleIds"></param>
+    /// <returns></returns>
+    private List<string> GetUserPermissions(SysUser user, List<long> roleIds)
+    {
+        var superAdmin = user.AccountType == AccountTypeEnum.SuperAdmin;
+        var db = _sysUserRep.Context.CopyNew();
+
+        var allApi = GetSysAllApiInfoList().Select(u => u.Route).ToArray();
+        var menuPermissions = db.Queryable<SysMenu>()
+            .Where(u => u.Status == StatusEnum.Enable && u.Type == MenuTypeEnum.Btn)
+            .Select(u => u.Permission)
+            .Distinct()
+            .ToList();
+
+        // 超管返回所有权限
+        if (superAdmin) return allApi.Union(menuPermissions).Distinct().Order().ToList();
+
+        // 普通用户返回已授权标识 + 未不在菜单中的权限标识
+        var permissions = db.Queryable<SysMenu>()
+            .InnerJoin<SysRoleMenu>((u, a) => u.Id == a.MenuId)
+            .Where((u, a) => u.Status == StatusEnum.Enable && u.Type == MenuTypeEnum.Btn)
+            .Where((u, a) => roleIds.Contains(a.RoleId) && SqlFunc.Subqueryable<SysRoleApi>()
+                .Where(z => roleIds.Contains(z.RoleId) && u.Permission == z.Route).NotAny())
+            .Select(u => u.Permission)
+            .Distinct()
+            .ToList();
+        return allApi.Except(menuPermissions).Union(permissions).Distinct().Order().ToList();
+    }
+
+    /// <summary>
+    /// 获取用户不能访问的权限
+    /// </summary>
+    /// <param name="user"></param>
+    /// <param name="roleIds"></param>
+    /// <returns></returns>
+    private List<string> GetUserUnPermissions(SysUser user, List<long> roleIds)
+    {
+        var superAdmin = user.AccountType == AccountTypeEnum.SuperAdmin;
+        var db = _sysUserRep.Context.CopyNew();
+        if (superAdmin) return [];
+        return db.Union(db.Queryable<SysMenu>()
+                    .InnerJoin<SysRoleMenu>((u, a) => u.Id == a.MenuId)
+                    .Where((u, a) => u.Status == StatusEnum.Enable && u.Type == MenuTypeEnum.Btn)
+                    .Where((u, a) => !roleIds.Contains(a.RoleId))
+                    .Select(u => u.Permission),
+                db.Queryable<SysRoleApi>().Where(u => roleIds.Contains(u.RoleId)).Select(u => u.Route))
+            .ToList();
+    }
+
+    /// <summary>
+    /// 获取用户已授权的机构Id
+    /// </summary>
+    /// <param name="user"></param>
+    /// <param name="roleIds"></param>
+    /// <returns></returns>
+    private List<long> GetUserOrgIdList(SysUser user, List<long> roleIds)
+    {
+        var db = _sysUserRep.Context.CopyNew();
+        var orgIds = db.Union(
+                // 获取用户表中的机构Id
+                db.Queryable<SysUser>().IgnoreTenant().Select(u => new { UserId = u.Id, u.OrgId }),
+                // 获取用户创建的机构Id
+                db.Queryable<SysOrg>().IgnoreTenant().Where(u => u.CreateUserId != null).Select(u => new { UserId = u.CreateUserId.Value, OrgId = u.Id }),
+                // 获取用户扩展机构Id
+                db.Queryable<SysUserExtOrg>().Select(u => new { u.UserId, u.OrgId }),
+                // 获取用户角色关联的机构Id
+                db.Queryable<SysRoleOrg>().InnerJoin<SysUserRole>((u, a) => u.RoleId == a.RoleId).Select((u, a) => new { a.UserId, u.OrgId }),
+                // 获取包含全部数据权限的机构Id
+                db.Queryable<SysOrg>().IgnoreTenant().FullJoin<SysUserRole>((u, a) => a.SysRole.DataScope == DataScopeEnum.All).Select((u, a) => new { a.UserId, OrgId = u.Id }),
+                // 超管获取全部机构Id
+                db.Queryable<SysOrg>().IgnoreTenant().FullJoin<SysUser>((u, a) => a.AccountType == AccountTypeEnum.SuperAdmin).Select((u, a) => new { UserId = a.Id, OrgId = u.Id }))
+            .Where(u => SqlFunc.IsNull(u.OrgId, 0) != 0 && u.UserId == user.Id)
+            .Select(u => u.OrgId)
+            .Distinct()
+            .ToList();
+
+        // 如果存在本部门及以下，则获取本部门及以下机构的Id
+        var dataScopes = db.Queryable<SysRole>().Where(u => roleIds.Contains(u.Id)).Select(u => u.DataScope).Distinct().ToList();
+        if (dataScopes.Any(u => u == DataScopeEnum.DeptChild))
+        {
+            var childOrg = db.Queryable<SysOrg>().IgnoreTenant().ToTree(u => u.Children, u => u.Pid, user.OrgId);
+            if (childOrg == null || childOrg.Count > 0) return orgIds;
+            var queue = new Queue<SysOrg>(childOrg);
+            while (queue.Count > 0)
+            {
+                var org = queue.Dequeue();
+                if (org.Children is { Count: > 0 }) queue.EnqueueRange(org.Children);
+                orgIds.Add(org.Id);
+            }
+        }
+        return orgIds;
+    }
+
+    /// <summary>
+    /// 刷新Session
+    /// </summary>
+    /// <param name="userId"></param>
+    [NonAction]
+    public async Task RefreshSession(long userId)
+    {
+        var user = await _sysUserRep.AsQueryable().IgnoreTenant().Includes(u => u.SysOrg).FirstAsync(u => u.Id == userId);
+        await SetUserSession(user, CommonHelper.IsMobile(_httpContextAccessor.HttpContext?.Request.Headers.UserAgent ?? "") ? LoginModeEnum.APP : LoginModeEnum.PC);
     }
 }

Admin.NET/Admin.NET.Core/Service/Common/Dto/ApiOutput.cs

@@ -12,14 +12,24 @@ namespace Admin.NET.Core.Service;
 public class ApiOutput
 {
     /// <summary>
-    /// 名称（组名、路由名）
+    /// 组名
+    /// </summary>
+    public string GroupName { get; set; }
+
+    /// <summary>
+    /// 控制器名称
     /// </summary>
     public string Name { get; set; }
 
     /// <summary>
     /// 描述
     /// </summary>
-    public string Text { get; set; }
+    public string Desc { get; set; }
+
+    /// <summary>
+    /// 是否是移动端接口
+    /// </summary>
+    public bool IsAppApi { get; set; }
 
     /// <summary>
     /// 路由

Admin.NET/Admin.NET.Core/Service/Common/SysCommonService.cs

@@ -103,7 +103,7 @@ public class SysCommonService : IDynamicApiController, ITransient
             var apiOuput = new ApiOutput
             {
                 Name = "",
-                Text = string.IsNullOrWhiteSpace(group.GroupName) ? "系统接口" : group.GroupName,
+                Desc = string.IsNullOrWhiteSpace(group.GroupName) ? "系统接口" : group.GroupName,
                 Route = "",
             };
             // 获取分组的所有接口
@@ -134,7 +134,7 @@ public class SysCommonService : IDynamicApiController, ITransient
                     apiOuput.Children.Add(new ApiOutput
                     {
                         Name = controllerName,
-                        Text = string.IsNullOrWhiteSpace(controllerText) ? controllerName : controllerText,
+                        Desc = string.IsNullOrWhiteSpace(controllerText) ? controllerName : controllerText,
                         Route = "",
                         Order = apiDescription?.Order ?? 0,
                     });
@@ -149,7 +149,7 @@ public class SysCommonService : IDynamicApiController, ITransient
                 apiController.Children.Add(new ApiOutput
                 {
                     Name = "",
-                    Text = apiText,
+                    Desc = apiText,
                     Route = route,
                     Action = actionName,
                     HttpMethod = action.HttpMethod,
@@ -172,16 +172,8 @@ public class SysCommonService : IDynamicApiController, ITransient
     [DisplayName("获取所有移动端接口")]
     public List<string> GetAppApiList()
     {
-        List<string> apiList = [];
+        var allApi = App.GetService<SysAuthService>().GetSysAllApiInfoList();
-        var queue = new Queue<ApiOutput>(GetApiList());
+        return allApi.Where(u => u.IsAppApi).Select(u => u.Route).ToList();
-        var item = queue.Dequeue();
-        while (item != null)
-        {
-            if (item.Children is { Count: > 0 }) queue.EnqueueRange(item.Children);
-            else apiList.Add(item.Route);
-            item = queue.Count > 0 ? queue.Dequeue() : null;
-        }
-        return apiList;
     }
 
     /// <summary>
@@ -212,7 +204,7 @@ public class SysCommonService : IDynamicApiController, ITransient
                 {
                     var value = item.HttpMethod.Equals("get", StringComparison.CurrentCultureIgnoreCase) ? "params" : "data";
 
-                    stringBuilder.Append($@"// {item.Text}");
+                    stringBuilder.Append($@"// {item.Desc}");
                     stringBuilder.AppendLine();
                     stringBuilder.Append($@"export const {item.Action}Api = ({value}) => http.{item.HttpMethod.ToLower()}('/{defaultRoutePrefix}/{item.Route}', {value})");
                     stringBuilder.AppendLine();

Admin.NET/Admin.NET.Core/Service/User/UserManager.cs

@@ -126,9 +126,9 @@ public class UserManager(
     public override string OpenId => Session?.OpenId;
 
     /// <summary>
-    /// 最大数据范围权限
+    /// 数据范围权限列表
     /// </summary>
-    public override DataScopeEnum? MaxDataScope => Session?.MaxDataScope;
+    public override List<DataScopeEnum> DataScopeList => Session?.DataScopeList;
 
     /// <summary>
     /// 角色Id集

Admin.NET/Admin.NET.Core/Service/User/UserSessionDao.cs

@@ -67,10 +67,15 @@ public class UserSessionDao
     [Newtonsoft.Json.JsonIgnore]
     public bool SysAdmin => AccountType == AccountTypeEnum.SysAdmin;
 
+    /// <summary>
+    /// 数据范围权限列表
+    /// </summary>
+    public virtual List<DataScopeEnum> DataScopeList { get; set; }
+
     /// <summary>
     /// 最大数据范围权限
     /// </summary>
-    public virtual DataScopeEnum? MaxDataScope { get; set; }
+    public DataScopeEnum MaxDataScope => DataScopeList.Any(u => u == DataScopeEnum.All) ? DataScopeEnum.All : DataScopeList.Any(u => u == DataScopeEnum.Define) ? DataScopeEnum.Define : DataScopeList.Min();
 
     /// <summary>
     /// 组织机构Id

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs

@@ -116,8 +116,8 @@ public static class SqlSugarFilter
         var session = LazyHelper.GetService<UserManager>().Value.GetSessionOrRefresh(userId);
         if (session == null) return (int)DataScopeEnum.Self;
 
-        // 获取用户最大数据范围---仅本人数据
+        // 获取用户最大数据范围--- 全部数据 -> 自定义
-        maxDataScope = (int)session.MaxDataScope!;
+        maxDataScope = (int)session.MaxDataScope;
         if (maxDataScope != (int)DataScopeEnum.Self) return maxDataScope;
 
         // 配置用户数据范围缓存