Procházet zdrojové kódy

原来的字段设计不太适合业务使用,业务数据的机构内容通常是需要用户指定,不应取创建人机构取过滤

Signed-off-by: Lzh666 <422235757@qq.com>
Lzh666 před 1 rokem
rodič
revize
66ddff3bfa

+ 152 - 147
Admin.NET/Admin.NET.Core/Entity/EntityBase.cs

@@ -1,148 +1,153 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// 框架实体基类Id
-/// </summary>
-public abstract class EntityBaseId
-{
-    /// <summary>
-    /// 雪花Id
-    /// </summary>
-    [SugarColumn(ColumnName = "Id", ColumnDescription = "主键Id", IsPrimaryKey = true, IsIdentity = false)]
-    public virtual long Id { get; set; }
-}
-
-/// <summary>
-/// 框架实体基类
-/// </summary>
-[SugarIndex("index_{table}_CT", nameof(CreateTime), OrderByType.Asc)]
-public abstract class EntityBase : EntityBaseId, IDeletedFilter
-{
-    /// <summary>
-    /// 创建时间
-    /// </summary>
-    [SugarColumn(ColumnDescription = "创建时间", IsNullable = true, IsOnlyIgnoreUpdate = true)]
-    public virtual DateTime CreateTime { get; set; }
-
-    /// <summary>
-    /// 更新时间
-    /// </summary>
-    [SugarColumn(ColumnDescription = "更新时间")]
-    public virtual DateTime? UpdateTime { get; set; }
-
-    /// <summary>
-    /// 创建者Id
-    /// </summary>
-    [OwnerUser]
-    [SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true)]
-    public virtual long? CreateUserId { get; set; }
-
-    ///// <summary>
-    ///// 创建者
-    ///// </summary>
-    //[Newtonsoft.Json.JsonIgnore]
-    //[System.Text.Json.Serialization.JsonIgnore]
-    //[Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
-    //public virtual SysUser CreateUser { get; set; }
-
-    /// <summary>
-    /// 创建者姓名
-    /// </summary>
-    [SugarColumn(ColumnDescription = "创建者姓名", Length = 64, IsOnlyIgnoreUpdate = true)]
-    public virtual string? CreateUserName { get; set; }
-
-    /// <summary>
-    /// 修改者Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "修改者Id")]
-    public virtual long? UpdateUserId { get; set; }
-
-    ///// <summary>
-    ///// 修改者
-    ///// </summary>
-    //[Newtonsoft.Json.JsonIgnore]
-    //[System.Text.Json.Serialization.JsonIgnore]
-    //[Navigate(NavigateType.OneToOne, nameof(UpdateUserId))]
-    //public virtual SysUser UpdateUser { get; set; }
-
-    /// <summary>
-    /// 修改者姓名
-    /// </summary>
-    [SugarColumn(ColumnDescription = "修改者姓名", Length = 64)]
-    public virtual string? UpdateUserName { get; set; }
-
-    /// <summary>
-    /// 软删除
-    /// </summary>
-    [SugarColumn(ColumnDescription = "软删除")]
-    public virtual bool IsDelete { get; set; } = false;
-}
-
-/// <summary>
-/// 业务数据实体基类(数据权限)
-/// </summary>
-public abstract class EntityBaseData : EntityBase, IOrgIdFilter
-{
-    /// <summary>
-    /// 创建者部门Id
-    /// </summary>
-    [OwnerOrg]
-    [SugarColumn(ColumnDescription = "创建者部门Id", IsOnlyIgnoreUpdate = true)]
-    public virtual long? CreateOrgId { get; set; }
-
-    /// <summary>
-    /// 创建者部门
-    /// </summary>
-    [Newtonsoft.Json.JsonIgnore]
-    [System.Text.Json.Serialization.JsonIgnore]
-    [Navigate(NavigateType.OneToOne, nameof(CreateOrgId))]
-    public virtual SysOrg CreateOrg { get; set; }
-
-    /// <summary>
-    /// 创建者部门名称
-    /// </summary>
-    [SugarColumn(ColumnDescription = "创建者部门名称", Length = 64, IsOnlyIgnoreUpdate = true)]
-    public virtual string? CreateOrgName { get; set; }
-}
-
-/// <summary>
-/// 租户实体基类
-/// </summary>
-public abstract class EntityTenant : EntityBase, ITenantIdFilter
-{
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
-    public virtual long? TenantId { get; set; }
-}
-
-/// <summary>
-/// 租户实体基类Id
-/// </summary>
-public abstract class EntityTenantId : EntityBaseId, ITenantIdFilter
-{
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
-    public virtual long? TenantId { get; set; }
-}
-
-/// <summary>
-/// 租户实体基类 + 业务数据(数据权限)
-/// </summary>
-public abstract class EntityTenantBaseData : EntityBaseData, ITenantIdFilter
-{
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
-    public virtual long? TenantId { get; set; }
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 框架实体基类Id
+/// </summary>
+public abstract class EntityBaseId
+{
+    /// <summary>
+    /// 雪花Id
+    /// </summary>
+    [SugarColumn(ColumnName = "Id", ColumnDescription = "主键Id", IsPrimaryKey = true, IsIdentity = false)]
+    public virtual long Id { get; set; }
+}
+
+/// <summary>
+/// 框架实体基类
+/// </summary>
+[SugarIndex("index_{table}_CT", nameof(CreateTime), OrderByType.Asc)]
+public abstract class EntityBase : EntityBaseId, IDeletedFilter
+{
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建时间", IsNullable = true, IsOnlyIgnoreUpdate = true)]
+    public virtual DateTime CreateTime { get; set; }
+
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    [SugarColumn(ColumnDescription = "更新时间")]
+    public virtual DateTime? UpdateTime { get; set; }
+
+    /// <summary>
+    /// 创建者Id
+    /// </summary>
+    [OwnerUser]
+    [SugarColumn(ColumnDescription = "创建者Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? CreateUserId { get; set; }
+
+    ///// <summary>
+    ///// 创建者
+    ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
+    //[Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
+    //public virtual SysUser CreateUser { get; set; }
+
+    /// <summary>
+    /// 创建者姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者姓名", Length = 64, IsOnlyIgnoreUpdate = true)]
+    public virtual string? CreateUserName { get; set; }
+
+    /// <summary>
+    /// 修改者Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者Id")]
+    public virtual long? UpdateUserId { get; set; }
+
+    ///// <summary>
+    ///// 修改者
+    ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
+    //[Navigate(NavigateType.OneToOne, nameof(UpdateUserId))]
+    //public virtual SysUser UpdateUser { get; set; }
+
+    /// <summary>
+    /// 修改者姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者姓名", Length = 64)]
+    public virtual string? UpdateUserName { get; set; }
+
+    /// <summary>
+    /// 软删除
+    /// </summary>
+    [SugarColumn(ColumnDescription = "软删除")]
+    public virtual bool IsDelete { get; set; } = false;
+}
+
+/// <summary>
+/// 业务数据实体基类(数据权限)
+/// </summary>
+public abstract class EntityBaseData : EntityBase, IOrgIdFilter
+{
+    /// <summary>
+    /// 机构Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "机构Id", IsNullable = true)]
+    public virtual long OrgId { get; set; }
+
+    ///// <summary>
+    ///// 创建者部门Id
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "创建者部门Id", IsOnlyIgnoreUpdate = true)]
+    //public virtual long? CreateOrgId { get; set; }
+
+    ///// <summary>
+    ///// 创建者部门
+    ///// </summary>
+    //[Newtonsoft.Json.JsonIgnore]
+    //[System.Text.Json.Serialization.JsonIgnore]
+    //[Navigate(NavigateType.OneToOne, nameof(CreateOrgId))]
+    //public virtual SysOrg CreateOrg { get; set; }
+
+    ///// <summary>
+    ///// 创建者部门名称
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "创建者部门名称", Length = 64, IsOnlyIgnoreUpdate = true)]
+    //public virtual string? CreateOrgName { get; set; }
+}
+
+/// <summary>
+/// 租户实体基类
+/// </summary>
+public abstract class EntityTenant : EntityBase, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 租户实体基类Id
+/// </summary>
+public abstract class EntityTenantId : EntityBaseId, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 租户实体基类 + 业务数据(数据权限)
+/// </summary>
+public abstract class EntityTenantBaseData : EntityBaseData, ITenantIdFilter
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "租户Id", IsOnlyIgnoreUpdate = true)]
+    public virtual long? TenantId { get; set; }
 }

+ 3 - 3
Admin.NET/Admin.NET.Core/Entity/IEntityFilter.cs

@@ -1,4 +1,4 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
 //
 // 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
 //
@@ -34,7 +34,7 @@ internal interface ITenantIdFilter
 internal interface IOrgIdFilter
 {
     /// <summary>
-    /// 创建者部门Id
+    /// 机构Id
     /// </summary>
-    long? CreateOrgId { get; set; }
+    long OrgId { get; set; }
 }

+ 6 - 6
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -13,7 +13,7 @@ namespace Admin.NET.Core;
 [SysTable]
 [SugarIndex("index_{table}_A", nameof(Account), OrderByType.Asc)]
 [SugarIndex("index_{table}_P", nameof(Phone), OrderByType.Asc)]
-public partial class SysUser : EntityTenant
+public partial class SysUser : EntityTenantBaseData
 {
     /// <summary>
     /// 账号
@@ -191,11 +191,11 @@ public partial class SysUser : EntityTenant
     [SugarColumn(ColumnDescription = "账号类型")]
     public AccountTypeEnum AccountType { get; set; } = AccountTypeEnum.NormalUser;
 
-    /// <summary>
-    /// 直属机构Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "直属机构Id")]
-    public long OrgId { get; set; }
+    ///// <summary>
+    ///// 直属机构Id
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "直属机构Id")]
+    //public long OrgId { get; set; }
 
     /// <summary>
     /// 直属机构

+ 3 - 13
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -57,24 +57,14 @@ public class SysUserService : IDynamicApiController, ITransient
     [DisplayName("获取用户分页列表")]
     public virtual async Task<SqlSugarPagedList<UserOutput>> Page(PageUserInput input)
     {
-        // 获取用户拥有的机构集合
-        var userOrgIdList = await _sysOrgService.GetUserOrgIdList();
-        List<long> orgList;
-        if (input.OrgId > 0) // 指定机构查询时
-        {
-            orgList = await _sysOrgService.GetChildIdListWithSelfById(input.OrgId);
-            orgList = _userManager.SuperAdmin ? orgList : orgList.Where(u => userOrgIdList.Contains(u)).ToList();
-        }
-        else // 各管理员只能看到自己机构下的用户列表
-        {
-            orgList = _userManager.SuperAdmin ? null : userOrgIdList;
-        }
+        //获取子节点Id集合(包含自己)
+        var orgList = await _sysOrgService.GetChildIdListWithSelfById(input.OrgId);
 
         return await _sysUserRep.AsQueryable()
             .LeftJoin<SysOrg>((u, a) => u.OrgId == a.Id)
             .LeftJoin<SysPos>((u, a, b) => u.PosId == b.Id)
             .Where(u => u.AccountType != AccountTypeEnum.SuperAdmin)
-            .WhereIF(orgList != null, u => orgList.Contains(u.OrgId))
+            .WhereIF(input.OrgId > 0, u => orgList.Contains(u.OrgId))
             .WhereIF(!_userManager.SuperAdmin, u => u.AccountType != AccountTypeEnum.SysAdmin)
             .WhereIF(_userManager.SuperAdmin && input.TenantId > 0, u => u.TenantId == input.TenantId)
             .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))

+ 204 - 241
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs

@@ -1,242 +1,205 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
-namespace Admin.NET.Core;
-
-public static class SqlSugarFilter
-{
-    /// <summary>
-    /// 缓存全局查询过滤器(内存缓存)
-    /// </summary>
-    private static readonly ICache Cache = NewLife.Caching.Cache.Default;
-
-    private static readonly SysOrgService SysOrgService = App.GetRequiredService<SysOrgService>();
-    private static readonly SysCacheService SysCacheService = App.GetRequiredService<SysCacheService>();
-
-    /// <summary>
-    /// 删除用户机构缓存
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <param name="dbConfigId"></param>
-    public static void DeleteUserOrgCache(long userId, string dbConfigId)
-    {
-        // 删除用户机构集合缓存
-        SysCacheService.Remove($"{CacheConst.KeyUserOrg}{userId}");
-        // 删除最大数据权限缓存
-        SysCacheService.Remove($"{CacheConst.KeyRoleMaxDataScope}{userId}");
-        // 用户权限缓存(按钮集合)
-        SysCacheService.Remove($"{CacheConst.KeyUserButton}{userId}");
-        // 删除用户机构(数据范围)缓存——过滤器
-        Cache.Remove($"db:{dbConfigId}:orgList:{userId}");
-    }
-
-    /// <summary>
-    /// 删除自定义过滤器缓存
-    /// </summary>
-    /// <param name="userId"></param>
-    /// <param name="dbConfigId"></param>
-    public static void DeleteCustomCache(long userId, string dbConfigId)
-    {
-        // 删除自定义缓存——过滤器
-        Cache.Remove($"db:{dbConfigId}:custom:{userId}");
-    }
-
-    /// <summary>
-    /// 配置用户机构集合过滤器
-    /// </summary>
-    public static void SetOrgEntityFilter(SqlSugarScopeProvider db)
-    {
-        // 若仅本人数据,则直接返回
-        var maxDataScope = SetDataScopeFilter(db);
-        if (maxDataScope is 0 or (int)DataScopeEnum.Self) return;
-
-        long.TryParse(App.HttpContext?.User.FindFirst(ClaimConst.UserId)?.Value, out var userId);
-        if (userId <= 0) return;
-
-        // 配置用户机构集合缓存
-        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:orgList:{userId}";
-        var orgFilter = Cache.Get<ConcurrentDictionary<Type, LambdaExpression>>(cacheKey);
-        if (orgFilter == null)
-        {
-            // 获取用户最大数据范围,如果是全部数据,则跳过
-            if (maxDataScope == (int)DataScopeEnum.All) return;
-
-            // 获取用户所属机构,保证同一作用域
-            var orgIds = new List<long>();
-            Scoped.Create((factory, scope) =>
-            {
-                var services = scope.ServiceProvider;
-                orgIds = services.GetRequiredService<SysOrgService>().GetUserOrgIdList().GetAwaiter().GetResult();
-            });
-            if (orgIds == null || orgIds.Count == 0) return;
-
-            // 获取业务实体数据表
-            var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
-                && u.IsSubclassOf(typeof(EntityBaseData)));
-            if (!entityTypes.Any()) return;
-
-            orgFilter = new ConcurrentDictionary<Type, LambdaExpression>();
-            foreach (var entityType in entityTypes)
-            {
-                // 排除非当前数据库实体
-                var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
-                if ((tAtt != null && db.CurrentConnectionConfig.ConfigId.ToString() != tAtt.configId.ToString()))
-                    continue;
-
-                //var lambda = DynamicExpressionParser.ParseLambda(new[] {
-                //    Expression.Parameter(entityType, "u") }, typeof(bool), $"@0.Contains(u.{nameof(EntityBaseData.CreateOrgId)}??{default(long)})", orgIds);
-                var lambda = entityType.GetConditionExpression<OwnerOrgAttribute>(orgIds);
-
-                db.QueryFilter.AddTableFilter(entityType, lambda);
-                orgFilter.TryAdd(entityType, lambda);
-            }
-            Cache.Add(cacheKey, orgFilter);
-        }
-        else
-        {
-            foreach (var filter in orgFilter)
-                db.QueryFilter.AddTableFilter(filter.Key, filter.Value);
-        }
-    }
-
-    /// <summary>
-    /// 配置用户仅本人数据过滤器
-    /// </summary>
-    private static int SetDataScopeFilter(SqlSugarScopeProvider db)
-    {
-        var maxDataScope = (int)DataScopeEnum.All;
-
-        long.TryParse(App.HttpContext?.User.FindFirst(ClaimConst.UserId)?.Value, out var userId);
-        if (userId <= 0) return maxDataScope;
-
-        // 获取用户最大数据范围---仅本人数据
-        maxDataScope = App.GetRequiredService<SysCacheService>().Get<int>(CacheConst.KeyRoleMaxDataScope + userId);
-        // 若为0则获取用户机构组织集合建立缓存
-        if (maxDataScope == 0)
-        {
-            // 获取用户所属机构,保证同一作用域
-            Scoped.Create((factory, scope) =>
-            {
-                SysOrgService.GetUserOrgIdList().GetAwaiter().GetResult();
-                maxDataScope = SysCacheService.Get<int>(CacheConst.KeyRoleMaxDataScope + userId);
-            });
-        }
-        if (maxDataScope != (int)DataScopeEnum.Self) return maxDataScope;
-
-        // 配置用户数据范围缓存
-        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:dataScope:{userId}";
-        var dataScopeFilter = Cache.Get<ConcurrentDictionary<Type, LambdaExpression>>(cacheKey);
-        if (dataScopeFilter == null)
-        {
-            // 获取业务实体数据表
-            var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
-                && u.IsSubclassOf(typeof(EntityBaseData)));
-            if (!entityTypes.Any()) return maxDataScope;
-
-            dataScopeFilter = new ConcurrentDictionary<Type, LambdaExpression>();
-            foreach (var entityType in entityTypes)
-            {
-                // 排除非当前数据库实体
-                var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
-                if ((tAtt != null && db.CurrentConnectionConfig.ConfigId.ToString() != tAtt.configId.ToString()))
-                    continue;
-
-                //var lambda = DynamicExpressionParser.ParseLambda(new[] {
-                //    Expression.Parameter(entityType, "u") }, typeof(bool), $"u.{nameof(EntityBaseData.CreateUserId)}=@0", userId);
-                var lambda = entityType.GetConditionExpression<OwnerUserAttribute>(new List<long> { userId });
-
-                db.QueryFilter.AddTableFilter(entityType, lambda);
-                dataScopeFilter.TryAdd(entityType, lambda);
-            }
-            Cache.Add(cacheKey, dataScopeFilter);
-        }
-        else
-        {
-            foreach (var filter in dataScopeFilter)
-                db.QueryFilter.AddTableFilter(filter.Key, filter.Value);
-        }
-        return maxDataScope;
-    }
-
-    /// <summary>
-    /// 配置自定义过滤器
-    /// </summary>
-    public static void SetCustomEntityFilter(SqlSugarScopeProvider db)
-    {
-        // 配置自定义缓存
-        var userId = App.User?.FindFirst(ClaimConst.UserId)?.Value;
-        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:custom:{userId}";
-        var tableFilterItemList = Cache.Get<List<TableFilterItem<object>>>(cacheKey);
-        if (tableFilterItemList == null)
-        {
-            // 获取自定义实体过滤器
-            var entityFilterTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
-                && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(IEntityFilter))));
-            if (!entityFilterTypes.Any()) return;
-
-            var tableFilterItems = new List<TableFilterItem<object>>();
-            foreach (var entityFilter in entityFilterTypes)
-            {
-                var instance = Activator.CreateInstance(entityFilter);
-                var entityFilterMethod = entityFilter.GetMethod("AddEntityFilter");
-                var entityFilters = ((IList)entityFilterMethod?.Invoke(instance, null))?.Cast<object>();
-                if (entityFilters == null) continue;
-
-                foreach (var u in entityFilters)
-                {
-                    var tableFilterItem = (TableFilterItem<object>)u;
-                    var entityType = tableFilterItem.GetType().GetProperty("type", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(tableFilterItem, null) as Type;
-                    // 排除非当前数据库实体
-                    var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
-                    if ((tAtt != null && db.CurrentConnectionConfig.ConfigId.ToString() != tAtt.configId.ToString()) ||
-                        (tAtt == null && db.CurrentConnectionConfig.ConfigId.ToString() != SqlSugarConst.MainConfigId))
-                        continue;
-
-                    tableFilterItems.Add(tableFilterItem);
-                    db.QueryFilter.Add(tableFilterItem);
-                }
-            }
-            Cache.Add(cacheKey, tableFilterItems);
-        }
-        else
-        {
-            tableFilterItemList.ForEach(u =>
-            {
-                db.QueryFilter.Add(u);
-            });
-        }
-    }
-}
-
-/// <summary>
-/// 自定义实体过滤器接口
-/// </summary>
-public interface IEntityFilter
-{
-    /// <summary>
-    /// 实体过滤器
-    /// </summary>
-    /// <returns></returns>
-    IEnumerable<TableFilterItem<object>> AddEntityFilter();
-}
-
-///// <summary>
-///// 自定义业务实体过滤器示例
-///// </summary>
-//public class TestEntityFilter : IEntityFilter
-//{
-//    public IEnumerable<TableFilterItem<object>> AddEntityFilter()
-//    {
-//        // 构造自定义条件的过滤器
-//        Expression<Func<SysUser, bool>> dynamicExpression = u => u.Remark.Contains("xxx");
-//        var tableFilterItem = new TableFilterItem<object>(typeof(SysUser), dynamicExpression);
-
-//        return new[]
-//        {
-//            tableFilterItem
-//        };
-//    }
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
+
+namespace Admin.NET.Core;
+
+public static class SqlSugarFilter
+{
+    /// <summary>
+    /// 缓存全局查询过滤器(内存缓存)
+    /// </summary>
+    private static readonly ICache Cache = NewLife.Caching.Cache.Default;
+
+    private static readonly SysOrgService SysOrgService = App.GetRequiredService<SysOrgService>();
+    private static readonly SysCacheService SysCacheService = App.GetRequiredService<SysCacheService>();
+
+    /// <summary>
+    /// 删除用户机构缓存
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="dbConfigId"></param>
+    public static void DeleteUserOrgCache(long userId, string dbConfigId)
+    {
+        // 删除用户机构集合缓存
+        SysCacheService.Remove($"{CacheConst.KeyUserOrg}{userId}");
+        // 删除最大数据权限缓存
+        SysCacheService.Remove($"{CacheConst.KeyRoleMaxDataScope}{userId}");
+        // 用户权限缓存(按钮集合)
+        SysCacheService.Remove($"{CacheConst.KeyUserButton}{userId}");
+    }
+
+    /// <summary>
+    /// 删除自定义过滤器缓存
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="dbConfigId"></param>
+    public static void DeleteCustomCache(long userId, string dbConfigId)
+    {
+        // 删除自定义缓存——过滤器
+        Cache.Remove($"db:{dbConfigId}:custom:{userId}");
+    }
+
+    /// <summary>
+    /// 配置用户机构集合过滤器
+    /// </summary>
+    public static void SetOrgEntityFilter(SqlSugarScopeProvider db)
+    {
+        // 若仅本人数据,则直接返回
+        var maxDataScope = SetDataScopeFilter(db);
+        // 获取用户最大数据范围,如果是全部数据、仅本人,则跳过
+        if (maxDataScope is 0 or (int)DataScopeEnum.Self or (int)DataScopeEnum.All) return;
+
+        // 获取用户所属机构,保证同一作用域
+        var orgIds = new List<long>();
+        Scoped.Create((factory, scope) =>
+        {
+            var services = scope.ServiceProvider;
+            orgIds = services.GetRequiredService<SysOrgService>().GetUserOrgIdList().GetAwaiter().GetResult();
+        });
+        if (orgIds == null || orgIds.Count == 0) return;
+
+        //配置机构Id过滤器
+        db.QueryFilter.AddTableFilter<IOrgIdFilter>(o => SqlFunc.ContainsArray(orgIds, o.OrgId));
+    }
+
+    /// <summary>
+    /// 配置用户仅本人数据过滤器
+    /// </summary>
+    private static int SetDataScopeFilter(SqlSugarScopeProvider db)
+    {
+        var maxDataScope = (int)DataScopeEnum.All;
+
+        long.TryParse(App.HttpContext?.User.FindFirst(ClaimConst.UserId)?.Value, out var userId);
+        if (userId <= 0) return maxDataScope;
+
+        // 获取用户最大数据范围---仅本人数据
+        maxDataScope = App.GetRequiredService<SysCacheService>().Get<int>(CacheConst.KeyRoleMaxDataScope + userId);
+        // 若为0则获取用户机构组织集合建立缓存
+        if (maxDataScope == 0)
+        {
+            // 获取用户所属机构,保证同一作用域
+            Scoped.Create((factory, scope) =>
+            {
+                SysOrgService.GetUserOrgIdList().GetAwaiter().GetResult();
+                maxDataScope = SysCacheService.Get<int>(CacheConst.KeyRoleMaxDataScope + userId);
+            });
+        }
+        if (maxDataScope != (int)DataScopeEnum.Self) return maxDataScope;
+
+        // 配置用户数据范围缓存
+        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:dataScope:{userId}";
+        var dataScopeFilter = Cache.Get<ConcurrentDictionary<Type, LambdaExpression>>(cacheKey);
+        if (dataScopeFilter == null)
+        {
+            // 获取业务实体数据表
+            var entityTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
+                && u.IsSubclassOf(typeof(EntityBaseData)));
+            if (!entityTypes.Any()) return maxDataScope;
+
+            dataScopeFilter = new ConcurrentDictionary<Type, LambdaExpression>();
+            foreach (var entityType in entityTypes)
+            {
+                // 排除非当前数据库实体
+                var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
+                if ((tAtt != null && db.CurrentConnectionConfig.ConfigId.ToString() != tAtt.configId.ToString()))
+                    continue;
+
+                //var lambda = DynamicExpressionParser.ParseLambda(new[] {
+                //    Expression.Parameter(entityType, "u") }, typeof(bool), $"u.{nameof(EntityBaseData.CreateUserId)}=@0", userId);
+                var lambda = entityType.GetConditionExpression<OwnerUserAttribute>(new List<long> { userId });
+
+                db.QueryFilter.AddTableFilter(entityType, lambda);
+                dataScopeFilter.TryAdd(entityType, lambda);
+            }
+            Cache.Add(cacheKey, dataScopeFilter);
+        }
+        else
+        {
+            foreach (var filter in dataScopeFilter)
+                db.QueryFilter.AddTableFilter(filter.Key, filter.Value);
+        }
+        return maxDataScope;
+    }
+
+    /// <summary>
+    /// 配置自定义过滤器
+    /// </summary>
+    public static void SetCustomEntityFilter(SqlSugarScopeProvider db)
+    {
+        // 配置自定义缓存
+        var userId = App.User?.FindFirst(ClaimConst.UserId)?.Value;
+        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:custom:{userId}";
+        var tableFilterItemList = Cache.Get<List<TableFilterItem<object>>>(cacheKey);
+        if (tableFilterItemList == null)
+        {
+            // 获取自定义实体过滤器
+            var entityFilterTypes = App.EffectiveTypes.Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass
+                && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(IEntityFilter))));
+            if (!entityFilterTypes.Any()) return;
+
+            var tableFilterItems = new List<TableFilterItem<object>>();
+            foreach (var entityFilter in entityFilterTypes)
+            {
+                var instance = Activator.CreateInstance(entityFilter);
+                var entityFilterMethod = entityFilter.GetMethod("AddEntityFilter");
+                var entityFilters = ((IList)entityFilterMethod?.Invoke(instance, null))?.Cast<object>();
+                if (entityFilters == null) continue;
+
+                foreach (var u in entityFilters)
+                {
+                    var tableFilterItem = (TableFilterItem<object>)u;
+                    var entityType = tableFilterItem.GetType().GetProperty("type", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(tableFilterItem, null) as Type;
+                    // 排除非当前数据库实体
+                    var tAtt = entityType.GetCustomAttribute<TenantAttribute>();
+                    if ((tAtt != null && db.CurrentConnectionConfig.ConfigId.ToString() != tAtt.configId.ToString()) ||
+                        (tAtt == null && db.CurrentConnectionConfig.ConfigId.ToString() != SqlSugarConst.MainConfigId))
+                        continue;
+
+                    tableFilterItems.Add(tableFilterItem);
+                    db.QueryFilter.Add(tableFilterItem);
+                }
+            }
+            Cache.Add(cacheKey, tableFilterItems);
+        }
+        else
+        {
+            tableFilterItemList.ForEach(u =>
+            {
+                db.QueryFilter.Add(u);
+            });
+        }
+    }
+}
+
+/// <summary>
+/// 自定义实体过滤器接口
+/// </summary>
+public interface IEntityFilter
+{
+    /// <summary>
+    /// 实体过滤器
+    /// </summary>
+    /// <returns></returns>
+    IEnumerable<TableFilterItem<object>> AddEntityFilter();
+}
+
+///// <summary>
+///// 自定义业务实体过滤器示例
+///// </summary>
+//public class TestEntityFilter : IEntityFilter
+//{
+//    public IEnumerable<TableFilterItem<object>> AddEntityFilter()
+//    {
+//        // 构造自定义条件的过滤器
+//        Expression<Func<SysUser, bool>> dynamicExpression = u => u.Remark.Contains("xxx");
+//        var tableFilterItem = new TableFilterItem<object>(typeof(SysUser), dynamicExpression);
+
+//        return new[]
+//        {
+//            tableFilterItem
+//        };
+//    }
 //}

+ 607 - 607
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -1,608 +1,608 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
-using DbType = SqlSugar.DbType;
-
-namespace Admin.NET.Core;
-
-public static class SqlSugarSetup
-{
-    // 多租户实例
-    public static ITenant ITenant { get; set; }
-
-    // 是否正在处理种子数据
-    private static bool _isHandlingSeedData = false;
-
-    /// <summary>
-    /// SqlSugar 上下文初始化
-    /// </summary>
-    /// <param name="services"></param>
-    public static void AddSqlSugar(this IServiceCollection services)
-    {
-        // 注册雪花Id
-        var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
-        YitIdHelper.SetIdGenerator(snowIdOpt);
-
-        // 自定义 SqlSugar 雪花ID算法
-        SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;
-        StaticConfig.CustomSnowFlakeFunc = () =>
-        {
-            return YitIdHelper.NextId();
-        };
-        // 动态表达式 SqlFunc 支持,https://www.donet5.com/Home/Doc?typeId=2569
-        StaticConfig.DynamicExpressionParserType = typeof(DynamicExpressionParser);
-        StaticConfig.DynamicExpressionParsingConfig = new ParsingConfig
-        {
-            CustomTypeProvider = new SqlSugarTypeProvider()
-        };
-
-        var dbOptions = App.GetConfig<DbConnectionOptions>("DbConnection", true);
-        dbOptions.ConnectionConfigs.ForEach(SetDbConfig);
-
-        SqlSugarScope sqlSugar = new(dbOptions.ConnectionConfigs.Adapt<List<ConnectionConfig>>(), db =>
-        {
-            dbOptions.ConnectionConfigs.ForEach(config =>
-            {
-                var dbProvider = db.GetConnectionScope(config.ConfigId);
-                SetDbAop(dbProvider, dbOptions.EnableConsoleSql, dbOptions.SuperAdminIgnoreIDeletedFilter);
-                SetDbDiffLog(dbProvider, config);
-            });
-        });
-        ITenant = sqlSugar;
-
-        services.AddSingleton<ISqlSugarClient>(sqlSugar); // 单例注册
-        services.AddScoped(typeof(SqlSugarRepository<>)); // 仓储注册
-        services.AddUnitOfWork<SqlSugarUnitOfWork>(); // 事务与工作单元注册
-
-        // 初始化数据库表结构及种子数据
-        dbOptions.ConnectionConfigs.ForEach(config =>
-        {
-            InitDatabase(sqlSugar, config);
-        });
-    }
-
-    /// <summary>
-    /// 配置连接属性
-    /// </summary>
-    /// <param name="config"></param>
-    public static void SetDbConfig(DbConnectionConfig config)
-    {
-        if (config.DbSettings.EnableConnStringEncrypt)
-            config.ConnectionString = CryptogramUtil.Decrypt(config.ConnectionString);
-
-        var configureExternalServices = new ConfigureExternalServices
-        {
-            EntityNameService = (type, entity) => // 处理表
-            {
-                entity.IsDisabledDelete = true; // 禁止删除非 sqlsugar 创建的列
-                // 只处理贴了特性[SugarTable]表
-                if (!type.GetCustomAttributes<SugarTable>().Any())
-                    return;
-                if (config.DbSettings.EnableUnderLine && !entity.DbTableName.Contains('_'))
-                    entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName); // 驼峰转下划线
-            },
-            EntityService = (type, column) => // 处理列
-            {
-                // 只处理贴了特性[SugarColumn]列
-                if (!type.GetCustomAttributes<SugarColumn>().Any())
-                    return;
-                if (new NullabilityInfoContext().Create(type).WriteState is NullabilityState.Nullable)
-                    column.IsNullable = true;
-                if (config.DbSettings.EnableUnderLine && !column.IsIgnore && !column.DbColumnName.Contains('_'))
-                    column.DbColumnName = UtilMethods.ToUnderLine(column.DbColumnName); // 驼峰转下划线
-            },
-            DataInfoCacheService = new SqlSugarCache(),
-        };
-        config.ConfigureExternalServices = configureExternalServices;
-        config.InitKeyType = InitKeyType.Attribute;
-        config.IsAutoCloseConnection = true;
-        config.MoreSettings = new ConnMoreSettings
-        {
-            IsAutoRemoveDataCache = true, // 启用自动删除缓存,所有增删改会自动调用.RemoveDataCache()
-            IsAutoDeleteQueryFilter = true, // 启用删除查询过滤器
-            IsAutoUpdateQueryFilter = true, // 启用更新查询过滤器
-            SqlServerCodeFirstNvarchar = true // 采用Nvarchar
-        };
-
-        // 若库类型是人大金仓则默认设置PG模式
-        if (config.DbType == DbType.Kdbndp)
-            config.MoreSettings.DatabaseModel = DbType.PostgreSQL; // 配置PG模式主要是兼容系统表差异
-
-        // 若库类型是Oracle则默认主键名字和参数名字最大长度
-        if (config.DbType == DbType.Oracle)
-            config.MoreSettings.MaxParameterNameLength = 30;
-    }
-
-    /// <summary>
-    /// 配置Aop
-    /// </summary>
-    /// <param name="db"></param>
-    /// <param name="enableConsoleSql"></param>
-    /// <param name="superAdminIgnoreIDeletedFilter"></param>
-    public static void SetDbAop(SqlSugarScopeProvider db, bool enableConsoleSql, bool superAdminIgnoreIDeletedFilter)
-    {
-        // 设置超时时间
-        db.Ado.CommandTimeOut = 30;
-
-        // 打印SQL语句
-        if (enableConsoleSql)
-        {
-            db.Aop.OnLogExecuting = (sql, pars) =>
-            {
-                //// 若参数值超过100个字符则进行截取
-                //foreach (var par in pars)
-                //{
-                //    if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
-                //    if (par.Value.ToString().Length > 100)
-                //        par.Value = string.Concat(par.Value.ToString()[..100], "......");
-                //}
-
-                var log = $"【{DateTime.Now}——执行SQL】\r\n{UtilMethods.GetNativeSql(sql, pars)}\r\n";
-                var originColor = Console.ForegroundColor;
-                if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
-                    Console.ForegroundColor = ConsoleColor.Green;
-                if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase))
-                    Console.ForegroundColor = ConsoleColor.Yellow;
-                if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase))
-                    Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine(log);
-                Console.ForegroundColor = originColor;
-                App.PrintToMiniProfiler("SqlSugar", "Info", log);
-            };
-        }
-        db.Aop.OnError = ex =>
-        {
-            if (ex.Parametres == null) return;
-            var log = $"【{DateTime.Now}——错误SQL】\r\n{UtilMethods.GetNativeSql(ex.Sql, (SugarParameter[])ex.Parametres)}\r\n";
-            Log.Error(log, ex);
-            App.PrintToMiniProfiler("SqlSugar", "Error", log);
-        };
-        db.Aop.OnLogExecuted = (sql, pars) =>
-        {
-            //// 若参数值超过100个字符则进行截取
-            //foreach (var par in pars)
-            //{
-            //    if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
-            //    if (par.Value.ToString().Length > 100)
-            //        par.Value = string.Concat(par.Value.ToString()[..100], "......");
-            //}
-
-            // 执行时间超过5秒时
-            if (!(db.Ado.SqlExecutionTime.TotalSeconds > 5)) return;
-
-            var fileName = db.Ado.SqlStackTrace.FirstFileName; // 文件名
-            var fileLine = db.Ado.SqlStackTrace.FirstLine; // 行号
-            var firstMethodName = db.Ado.SqlStackTrace.FirstMethodName; // 方法名
-            var log = $"【{DateTime.Now}——超时SQL】\r\n【所在文件名】:{fileName}\r\n【代码行数】:{fileLine}\r\n【方法名】:{firstMethodName}\r\n" + $"【SQL语句】:{UtilMethods.GetNativeSql(sql, pars)}";
-            Log.Warning(log);
-            App.PrintToMiniProfiler("SqlSugar", "Slow", log);
-        };
-
-        // 数据审计
-        db.Aop.DataExecuting = (_, entityInfo) =>
-        {
-            // 若正在处理种子数据则直接返回
-            if (_isHandlingSeedData) return;
-
-            // 新增/插入
-            if (entityInfo.OperationType == DataFilterType.InsertByObject)
-            {
-                // 若主键是长整型且空则赋值雪花Id
-                if (entityInfo.EntityColumnInfo.IsPrimarykey && !entityInfo.EntityColumnInfo.IsIdentity && entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long))
-                {
-                    var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue);
-                    if (id == null || (long)id == 0)
-                        entityInfo.SetValue(YitIdHelper.NextId());
-                }
-                // 若创建时间为空则赋值当前时间
-                else if (entityInfo.PropertyName == nameof(EntityBase.CreateTime))
-                {
-                    var createTime = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue)!;
-                    if (createTime == null || createTime.Equals(DateTime.MinValue))
-                        entityInfo.SetValue(DateTime.Now);
-                }
-                // 若当前用户为空(非web线程时)
-                if (App.User == null) return;
-
-                dynamic entityValue = entityInfo.EntityValue;
-                if (entityInfo.PropertyName == nameof(EntityTenantId.TenantId))
-                {
-                    var tenantId = entityValue.TenantId;
-                    if (tenantId == null || tenantId == 0)
-                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value);
-                }
-                else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserId))
-                {
-                    var createUserId = entityValue.CreateUserId;
-                    if (createUserId == 0 || createUserId == null)
-                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value);
-                }
-                else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserName))
-                {
-                    var createUserName = entityValue.CreateUserName;
-                    if (string.IsNullOrEmpty(createUserName))
-                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.RealName)?.Value);
-                }
-                else if (entityInfo.PropertyName == nameof(EntityBaseData.CreateOrgId))
-                {
-                    var createOrgId = entityValue.CreateOrgId;
-                    if (createOrgId == 0 || createOrgId == null)
-                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgId)?.Value);
-                }
-                else if (entityInfo.PropertyName == nameof(EntityBaseData.CreateOrgName))
-                {
-                    var createOrgName = entityValue.CreateOrgName;
-                    if (string.IsNullOrEmpty(createOrgName))
-                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgName)?.Value);
-                }
-            }
-            // 编辑/更新
-            else if (entityInfo.OperationType == DataFilterType.UpdateByObject)
-            {
-                if (entityInfo.PropertyName == nameof(EntityBase.UpdateTime))
-                    entityInfo.SetValue(DateTime.Now);
-                else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserId))
-                    entityInfo.SetValue(App.User?.FindFirst(ClaimConst.UserId)?.Value);
-                else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserName))
-                    entityInfo.SetValue(App.User?.FindFirst(ClaimConst.RealName)?.Value);
-            }
-        };
-
-        // 是否为超级管理员
-        var isSuperAdmin = App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString();
-
-        // 配置假删除过滤器,如果当前用户是超级管理员并且允许忽略软删除过滤器则不会应用
-        if (!isSuperAdmin || !superAdminIgnoreIDeletedFilter)
-            db.QueryFilter.AddTableFilter<IDeletedFilter>(u => u.IsDelete == false);
-
-        // 超管排除其他过滤器
-        if (isSuperAdmin) return;
-
-        // 配置租户过滤器
-        var tenantId = App.User?.FindFirst(ClaimConst.TenantId)?.Value;
-        if (!string.IsNullOrWhiteSpace(tenantId))
-            db.QueryFilter.AddTableFilter<ITenantIdFilter>(u => u.TenantId == long.Parse(tenantId));
-
-        // 配置用户机构(数据范围)过滤器
-        SqlSugarFilter.SetOrgEntityFilter(db);
-
-        // 配置自定义过滤器
-        SqlSugarFilter.SetCustomEntityFilter(db);
-    }
-
-    /// <summary>
-    /// 开启库表差异化日志
-    /// </summary>
-    /// <param name="db"></param>
-    /// <param name="config"></param>
-    private static void SetDbDiffLog(SqlSugarScopeProvider db, DbConnectionConfig config)
-    {
-        if (!config.DbSettings.EnableDiffLog) return;
-
-        async void AopOnDiffLogEvent(DiffLogModel u)
-        {
-            // 记录差异数据
-            var diffData = new List<dynamic>();
-            for (int i = 0; i < u.AfterData.Count; i++)
-            {
-                var diffColumns = new List<dynamic>();
-                var afterColumns = u.AfterData[i].Columns;
-                var beforeColumns = u.BeforeData[i].Columns;
-                for (int j = 0; j < afterColumns.Count; j++)
-                {
-                    if (afterColumns[j].Value.Equals(beforeColumns[j].Value)) continue;
-                    diffColumns.Add(new
-                    {
-                        afterColumns[j].IsPrimaryKey,
-                        afterColumns[j].ColumnName,
-                        afterColumns[j].ColumnDescription,
-                        BeforeValue = beforeColumns[j].Value,
-                        AfterValue = afterColumns[j].Value,
-                    });
-                }
-
-                diffData.Add(new { u.AfterData[i].TableName, u.AfterData[i].TableDescription, Columns = diffColumns });
-            }
-
-            var logDiff = new SysLogDiff
-            {
-                // 差异数据(字段描述、列名、值、表名、表描述)
-                DiffData = JSON.Serialize(diffData),
-                // 传进来的对象(如果对象为空,则使用首个数据的表名作为业务对象)
-                BusinessData = u.BusinessData == null ? u.AfterData.FirstOrDefault()?.TableName : JSON.Serialize(u.BusinessData),
-                // 枚举(insert、update、delete)
-                DiffType = u.DiffType.ToString(),
-                Sql = u.Sql,
-                Parameters = JSON.Serialize(u.Parameters.Select(e => new { e.ParameterName, e.Value, TypeName = e.DbType.ToString() })),
-                Elapsed = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds
-            };
-            var logDb = ITenant.IsAnyConnection(SqlSugarConst.LogConfigId) ? ITenant.GetConnectionScope(SqlSugarConst.LogConfigId) : ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
-            await logDb.CopyNew().Insertable(logDiff).ExecuteCommandAsync();
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.WriteLine(DateTime.Now + $"\r\n*****开始差异日志*****\r\n{Environment.NewLine}{JSON.Serialize(logDiff)}{Environment.NewLine}*****结束差异日志*****\r\n");
-        }
-
-        db.Aop.OnDiffLogEvent = AopOnDiffLogEvent;
-    }
-
-    /// <summary>
-    /// 初始化数据库
-    /// </summary>
-    /// <param name="db">SqlSugarScope 实例</param>
-    /// <param name="config">数据库连接配置</param>
-    private static void InitDatabase(SqlSugarScope db, DbConnectionConfig config)
-    {
-        var dbProvider = db.GetConnectionScope(config.ConfigId);
-
-        // 初始化数据库
-        if (config.DbSettings.EnableInitDb)
-        {
-            Log.Information($"初始化数据库 {config.DbType} - {config.ConfigId} - {config.ConnectionString}");
-            if (config.DbType != DbType.Oracle) dbProvider.DbMaintenance.CreateDatabase();
-        }
-
-        // 初始化表结构
-        if (config.TableSettings.EnableInitTable)
-        {
-            Log.Information($"初始化表结构 {config.DbType} - {config.ConfigId}");
-            var entityTypes = GetEntityTypesForInit(config);
-            InitializeTables(dbProvider, entityTypes, config);
-        }
-
-        // 初始化种子数据
-        if (config.SeedSettings.EnableInitSeed) InitSeedData(db, config);
-    }
-
-    /// <summary>
-    /// 获取需要初始化的实体类型
-    /// </summary>
-    /// <param name="config">数据库连接配置</param>
-    /// <returns>实体类型列表</returns>
-    private static List<Type> GetEntityTypesForInit(DbConnectionConfig config)
-    {
-        return App.EffectiveTypes
-            .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false))
-            .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any())
-            .WhereIF(config.TableSettings.EnableIncreTable, u => u.IsDefined(typeof(IncreTableAttribute), false))
-            .Where(u => IsEntityForConfig(u, config))
-            .ToList();
-    }
-
-    /// <summary>
-    /// 判断实体是否属于当前配置
-    /// </summary>
-    /// <param name="entityType">实体类型</param>
-    /// <param name="config">数据库连接配置</param>
-    /// <returns>是否属于当前配置</returns>
-    private static bool IsEntityForConfig(Type entityType, DbConnectionConfig config)
-    {
-        switch (config.ConfigId.ToString())
-        {
-            case SqlSugarConst.MainConfigId:
-                return entityType.GetCustomAttributes<SysTableAttribute>().Any() ||
-                       (!entityType.GetCustomAttributes<LogTableAttribute>().Any() &&
-                        !entityType.GetCustomAttributes<TenantAttribute>().Any());
-
-            case SqlSugarConst.LogConfigId:
-                return entityType.GetCustomAttributes<LogTableAttribute>().Any();
-
-            default:
-                {
-                    var tenantAttribute = entityType.GetCustomAttribute<TenantAttribute>();
-                    return tenantAttribute != null && tenantAttribute.configId.ToString() == config.ConfigId.ToString();
-                }
-        }
-    }
-
-    /// <summary>
-    /// 初始化表结构
-    /// </summary>
-    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
-    /// <param name="entityTypes">实体类型列表</param>
-    /// <param name="config">数据库连接配置</param>
-    private static void InitializeTables(SqlSugarScopeProvider dbProvider, List<Type> entityTypes, DbConnectionConfig config)
-    {
-        int count = 0, sum = entityTypes.Count;
-        var tasks = entityTypes.Select(entityType => Task.Run(() =>
-        {
-            Console.WriteLine($"初始化表结构 {entityType.FullName,-64} ({config.ConfigId} - {Interlocked.Increment(ref count):D003}/{sum:D003})");
-            UpdateNullableColumns(dbProvider, entityType);
-            InitializeTable(dbProvider, entityType);
-        }));
-
-        Task.WhenAll(tasks).GetAwaiter().GetResult();
-    }
-
-    /// <summary>
-    /// 更新表中不存在于实体的字段为可空
-    /// </summary>
-    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
-    /// <param name="entityType">实体类型</param>
-    private static void UpdateNullableColumns(SqlSugarScopeProvider dbProvider, Type entityType)
-    {
-        var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
-        var dbColumns = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? new List<DbColumnInfo>();
-
-        foreach (var dbColumn in dbColumns.Where(c => !c.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName != c.DbColumnName)))
-        {
-            dbColumn.IsNullable = true;
-            dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumn);
-        }
-    }
-
-    /// <summary>
-    /// 初始化表
-    /// </summary>
-    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
-    /// <param name="entityType">实体类型</param>
-    private static void InitializeTable(SqlSugarScopeProvider dbProvider, Type entityType)
-    {
-        if (entityType.GetCustomAttribute<SplitTableAttribute>() == null)
-        {
-            dbProvider.CodeFirst.InitTables(entityType);
-        }
-        else
-        {
-            dbProvider.CodeFirst.SplitTables().InitTables(entityType);
-        }
-    }
-
-    /// <summary>
-    /// 初始化种子数据
-    /// </summary>
-    /// <param name="db">SqlSugarScope 实例</param>
-    /// <param name="config">数据库连接配置</param>
-    private static void InitSeedData(SqlSugarScope db, DbConnectionConfig config)
-    {
-        var dbProvider = db.GetConnectionScope(config.ConfigId);
-        _isHandlingSeedData = true;
-
-        Log.Information($"初始化种子数据 {config.DbType} - {config.ConfigId}");
-        var seedDataTypes = GetSeedDataTypes(config);
-
-        int count = 0, sum = seedDataTypes.Count;
-        var tasks = seedDataTypes.Select(seedType => Task.Run(() =>
-        {
-            var entityType = seedType.GetInterfaces().First().GetGenericArguments().First();
-            if (!IsEntityForConfig(entityType, config)) return;
-
-            var seedData = GetSeedData(seedType);
-            if (seedData == null) return;
-
-            AdjustSeedDataIds(seedData, config);
-            InsertOrUpdateSeedData(dbProvider, seedType, entityType, seedData, config, ref count, sum);
-        }));
-
-        Task.WhenAll(tasks).GetAwaiter().GetResult();
-        _isHandlingSeedData = false;
-    }
-
-    /// <summary>
-    /// 获取种子数据类型
-    /// </summary>
-    /// <param name="config">数据库连接配置</param>
-    /// <returns>种子数据类型列表</returns>
-    private static List<Type> GetSeedDataTypes(DbConnectionConfig config)
-    {
-        return App.EffectiveTypes
-            .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>))))
-            .WhereIF(config.SeedSettings.EnableIncreSeed, u => u.IsDefined(typeof(IncreSeedAttribute), false))
-            .OrderBy(u => u.GetCustomAttributes(typeof(SeedDataAttribute), false).Length > 0 ? ((SeedDataAttribute)u.GetCustomAttributes(typeof(SeedDataAttribute), false)[0]).Order : 0)
-            .ToList();
-    }
-
-    /// <summary>
-    /// 获取种子数据
-    /// </summary>
-    /// <param name="seedType">种子数据类型</param>
-    /// <returns>种子数据列表</returns>
-    private static IEnumerable<object> GetSeedData(Type seedType)
-    {
-        var instance = Activator.CreateInstance(seedType);
-        var hasDataMethod = seedType.GetMethod("HasData");
-        return ((IEnumerable)hasDataMethod?.Invoke(instance, null))?.Cast<object>();
-    }
-
-    /// <summary>
-    /// 调整种子数据的 ID
-    /// </summary>
-    /// <param name="seedData">种子数据列表</param>
-    /// <param name="config">数据库连接配置</param>
-    private static void AdjustSeedDataIds(IEnumerable<object> seedData, DbConnectionConfig config)
-    {
-        var seedId = config.ConfigId.ToLong();
-        foreach (var data in seedData)
-        {
-            var idProperty = data.GetType().GetProperty(nameof(EntityBaseId.Id));
-            if (idProperty == null) continue;
-
-            var idValue = idProperty.GetValue(data);
-            if (idValue == null || idValue.ToString() == "0" || string.IsNullOrWhiteSpace(idValue.ToString()))
-            {
-                idProperty.SetValue(data, ++seedId);
-            }
-        }
-    }
-
-    /// <summary>
-    /// 插入或更新种子数据
-    /// </summary>
-    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
-    /// <param name="seedType">种子数据类型</param>
-    /// <param name="entityType">实体类型</param>
-    /// <param name="seedData">种子数据列表</param>
-    /// <param name="config">数据库连接配置</param>
-    /// <param name="count">当前处理的数量</param>
-    /// <param name="sum">总数量</param>
-    private static void InsertOrUpdateSeedData(SqlSugarScopeProvider dbProvider, Type seedType, Type entityType, IEnumerable<object> seedData, DbConnectionConfig config, ref int count, int sum)
-    {
-        var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
-        var dataList = seedData.ToList();
-
-        if (entityType.GetCustomAttribute<SplitTableAttribute>(true) != null)
-        {
-            var initMethod = seedType.GetMethod("Init");
-            initMethod?.Invoke(Activator.CreateInstance(seedType), new object[] { dbProvider });
-        }
-        else
-        {
-            int updateCount = 0, insertCount = 0;
-            if (entityInfo.Columns.Any(u => u.IsPrimarykey))
-            {
-                var storage = dbProvider.StorageableByObject(dataList).ToStorage();
-                if (seedType.GetCustomAttribute<IgnoreUpdateSeedAttribute>() == null)
-                {
-                    updateCount = storage.AsUpdateable
-                        .IgnoreColumns(entityInfo.Columns
-                            .Where(u => u.PropertyInfo.GetCustomAttribute<IgnoreUpdateSeedColumnAttribute>() != null)
-                            .Select(u => u.PropertyName).ToArray())
-                        .ExecuteCommand();
-                }
-                insertCount = storage.AsInsertable.ExecuteCommand();
-            }
-            else
-            {
-                if (!dbProvider.Queryable(entityInfo.DbTableName, entityInfo.DbTableName).Any())
-                {
-                    insertCount = dataList.Count;
-                    dbProvider.InsertableByObject(dataList).ExecuteCommand();
-                }
-            }
-            Console.WriteLine($"添加数据 {entityInfo.DbTableName,-32} ({config.ConfigId} - {Interlocked.Increment(ref count):D003}/{sum:D003},数据量:{dataList.Count:D003},插入 {insertCount:D003} 条记录,修改 {updateCount:D003} 条记录)");
-        }
-    }
-
-    /// <summary>
-    /// 初始化租户业务数据库
-    /// </summary>
-    /// <param name="iTenant"></param>
-    /// <param name="config"></param>
-    public static void InitTenantDatabase(ITenant iTenant, DbConnectionConfig config)
-    {
-        SetDbConfig(config);
-
-        if (!iTenant.IsAnyConnection(config.ConfigId.ToString()))
-            iTenant.AddConnection(config);
-        var db = iTenant.GetConnectionScope(config.ConfigId.ToString());
-        db.DbMaintenance.CreateDatabase();
-
-        // 获取所有业务表-初始化租户库表结构(排除系统表、日志表、特定库表)
-        var entityTypes = App.EffectiveTypes
-            .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any())
-            .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false) &&
-            !u.IsDefined(typeof(SysTableAttribute), false) && !u.IsDefined(typeof(LogTableAttribute), false) && !u.IsDefined(typeof(TenantAttribute), false)).ToList();
-        if (entityTypes.Count == 0) return;
-
-        foreach (var entityType in entityTypes)
-        {
-            var splitTable = entityType.GetCustomAttribute<SplitTableAttribute>();
-            if (splitTable == null)
-                db.CodeFirst.InitTables(entityType);
-            else
-                db.CodeFirst.SplitTables().InitTables(entityType);
-        }
-    }
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
+
+using DbType = SqlSugar.DbType;
+
+namespace Admin.NET.Core;
+
+public static class SqlSugarSetup
+{
+    // 多租户实例
+    public static ITenant ITenant { get; set; }
+
+    // 是否正在处理种子数据
+    private static bool _isHandlingSeedData = false;
+
+    /// <summary>
+    /// SqlSugar 上下文初始化
+    /// </summary>
+    /// <param name="services"></param>
+    public static void AddSqlSugar(this IServiceCollection services)
+    {
+        // 注册雪花Id
+        var snowIdOpt = App.GetConfig<SnowIdOptions>("SnowId", true);
+        YitIdHelper.SetIdGenerator(snowIdOpt);
+
+        // 自定义 SqlSugar 雪花ID算法
+        SnowFlakeSingle.WorkId = snowIdOpt.WorkerId;
+        StaticConfig.CustomSnowFlakeFunc = () =>
+        {
+            return YitIdHelper.NextId();
+        };
+        // 动态表达式 SqlFunc 支持,https://www.donet5.com/Home/Doc?typeId=2569
+        StaticConfig.DynamicExpressionParserType = typeof(DynamicExpressionParser);
+        StaticConfig.DynamicExpressionParsingConfig = new ParsingConfig
+        {
+            CustomTypeProvider = new SqlSugarTypeProvider()
+        };
+
+        var dbOptions = App.GetConfig<DbConnectionOptions>("DbConnection", true);
+        dbOptions.ConnectionConfigs.ForEach(SetDbConfig);
+
+        SqlSugarScope sqlSugar = new(dbOptions.ConnectionConfigs.Adapt<List<ConnectionConfig>>(), db =>
+        {
+            dbOptions.ConnectionConfigs.ForEach(config =>
+            {
+                var dbProvider = db.GetConnectionScope(config.ConfigId);
+                SetDbAop(dbProvider, dbOptions.EnableConsoleSql, dbOptions.SuperAdminIgnoreIDeletedFilter);
+                SetDbDiffLog(dbProvider, config);
+            });
+        });
+        ITenant = sqlSugar;
+
+        services.AddSingleton<ISqlSugarClient>(sqlSugar); // 单例注册
+        services.AddScoped(typeof(SqlSugarRepository<>)); // 仓储注册
+        services.AddUnitOfWork<SqlSugarUnitOfWork>(); // 事务与工作单元注册
+
+        // 初始化数据库表结构及种子数据
+        dbOptions.ConnectionConfigs.ForEach(config =>
+        {
+            InitDatabase(sqlSugar, config);
+        });
+    }
+
+    /// <summary>
+    /// 配置连接属性
+    /// </summary>
+    /// <param name="config"></param>
+    public static void SetDbConfig(DbConnectionConfig config)
+    {
+        if (config.DbSettings.EnableConnStringEncrypt)
+            config.ConnectionString = CryptogramUtil.Decrypt(config.ConnectionString);
+
+        var configureExternalServices = new ConfigureExternalServices
+        {
+            EntityNameService = (type, entity) => // 处理表
+            {
+                entity.IsDisabledDelete = true; // 禁止删除非 sqlsugar 创建的列
+                // 只处理贴了特性[SugarTable]表
+                if (!type.GetCustomAttributes<SugarTable>().Any())
+                    return;
+                if (config.DbSettings.EnableUnderLine && !entity.DbTableName.Contains('_'))
+                    entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName); // 驼峰转下划线
+            },
+            EntityService = (type, column) => // 处理列
+            {
+                // 只处理贴了特性[SugarColumn]列
+                if (!type.GetCustomAttributes<SugarColumn>().Any())
+                    return;
+                if (new NullabilityInfoContext().Create(type).WriteState is NullabilityState.Nullable)
+                    column.IsNullable = true;
+                if (config.DbSettings.EnableUnderLine && !column.IsIgnore && !column.DbColumnName.Contains('_'))
+                    column.DbColumnName = UtilMethods.ToUnderLine(column.DbColumnName); // 驼峰转下划线
+            },
+            DataInfoCacheService = new SqlSugarCache(),
+        };
+        config.ConfigureExternalServices = configureExternalServices;
+        config.InitKeyType = InitKeyType.Attribute;
+        config.IsAutoCloseConnection = true;
+        config.MoreSettings = new ConnMoreSettings
+        {
+            IsAutoRemoveDataCache = true, // 启用自动删除缓存,所有增删改会自动调用.RemoveDataCache()
+            IsAutoDeleteQueryFilter = true, // 启用删除查询过滤器
+            IsAutoUpdateQueryFilter = true, // 启用更新查询过滤器
+            SqlServerCodeFirstNvarchar = true // 采用Nvarchar
+        };
+
+        // 若库类型是人大金仓则默认设置PG模式
+        if (config.DbType == DbType.Kdbndp)
+            config.MoreSettings.DatabaseModel = DbType.PostgreSQL; // 配置PG模式主要是兼容系统表差异
+
+        // 若库类型是Oracle则默认主键名字和参数名字最大长度
+        if (config.DbType == DbType.Oracle)
+            config.MoreSettings.MaxParameterNameLength = 30;
+    }
+
+    /// <summary>
+    /// 配置Aop
+    /// </summary>
+    /// <param name="db"></param>
+    /// <param name="enableConsoleSql"></param>
+    /// <param name="superAdminIgnoreIDeletedFilter"></param>
+    public static void SetDbAop(SqlSugarScopeProvider db, bool enableConsoleSql, bool superAdminIgnoreIDeletedFilter)
+    {
+        // 设置超时时间
+        db.Ado.CommandTimeOut = 30;
+
+        // 打印SQL语句
+        if (enableConsoleSql)
+        {
+            db.Aop.OnLogExecuting = (sql, pars) =>
+            {
+                //// 若参数值超过100个字符则进行截取
+                //foreach (var par in pars)
+                //{
+                //    if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
+                //    if (par.Value.ToString().Length > 100)
+                //        par.Value = string.Concat(par.Value.ToString()[..100], "......");
+                //}
+
+                var log = $"【{DateTime.Now}——执行SQL】\r\n{UtilMethods.GetNativeSql(sql, pars)}\r\n";
+                var originColor = Console.ForegroundColor;
+                if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+                    Console.ForegroundColor = ConsoleColor.Green;
+                if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase))
+                    Console.ForegroundColor = ConsoleColor.Yellow;
+                if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase))
+                    Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine(log);
+                Console.ForegroundColor = originColor;
+                App.PrintToMiniProfiler("SqlSugar", "Info", log);
+            };
+        }
+        db.Aop.OnError = ex =>
+        {
+            if (ex.Parametres == null) return;
+            var log = $"【{DateTime.Now}——错误SQL】\r\n{UtilMethods.GetNativeSql(ex.Sql, (SugarParameter[])ex.Parametres)}\r\n";
+            Log.Error(log, ex);
+            App.PrintToMiniProfiler("SqlSugar", "Error", log);
+        };
+        db.Aop.OnLogExecuted = (sql, pars) =>
+        {
+            //// 若参数值超过100个字符则进行截取
+            //foreach (var par in pars)
+            //{
+            //    if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
+            //    if (par.Value.ToString().Length > 100)
+            //        par.Value = string.Concat(par.Value.ToString()[..100], "......");
+            //}
+
+            // 执行时间超过5秒时
+            if (!(db.Ado.SqlExecutionTime.TotalSeconds > 5)) return;
+
+            var fileName = db.Ado.SqlStackTrace.FirstFileName; // 文件名
+            var fileLine = db.Ado.SqlStackTrace.FirstLine; // 行号
+            var firstMethodName = db.Ado.SqlStackTrace.FirstMethodName; // 方法名
+            var log = $"【{DateTime.Now}——超时SQL】\r\n【所在文件名】:{fileName}\r\n【代码行数】:{fileLine}\r\n【方法名】:{firstMethodName}\r\n" + $"【SQL语句】:{UtilMethods.GetNativeSql(sql, pars)}";
+            Log.Warning(log);
+            App.PrintToMiniProfiler("SqlSugar", "Slow", log);
+        };
+
+        // 数据审计
+        db.Aop.DataExecuting = (_, entityInfo) =>
+        {
+            // 若正在处理种子数据则直接返回
+            if (_isHandlingSeedData) return;
+
+            // 新增/插入
+            if (entityInfo.OperationType == DataFilterType.InsertByObject)
+            {
+                // 若主键是长整型且空则赋值雪花Id
+                if (entityInfo.EntityColumnInfo.IsPrimarykey && !entityInfo.EntityColumnInfo.IsIdentity && entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long))
+                {
+                    var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue);
+                    if (id == null || (long)id == 0)
+                        entityInfo.SetValue(YitIdHelper.NextId());
+                }
+                // 若创建时间为空则赋值当前时间
+                else if (entityInfo.PropertyName == nameof(EntityBase.CreateTime))
+                {
+                    var createTime = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue)!;
+                    if (createTime == null || createTime.Equals(DateTime.MinValue))
+                        entityInfo.SetValue(DateTime.Now);
+                }
+                // 若当前用户为空(非web线程时)
+                if (App.User == null) return;
+
+                dynamic entityValue = entityInfo.EntityValue;
+                if (entityInfo.PropertyName == nameof(EntityTenantId.TenantId))
+                {
+                    var tenantId = entityValue.TenantId;
+                    if (tenantId == null || tenantId == 0)
+                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value);
+                }
+                else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserId))
+                {
+                    var createUserId = entityValue.CreateUserId;
+                    if (createUserId == 0 || createUserId == null)
+                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value);
+                }
+                else if (entityInfo.PropertyName == nameof(EntityBase.CreateUserName))
+                {
+                    var createUserName = entityValue.CreateUserName;
+                    if (string.IsNullOrEmpty(createUserName))
+                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.RealName)?.Value);
+                }
+                else if (entityInfo.PropertyName == "CreateOrgId")
+                {
+                    var createOrgId = entityValue.CreateOrgId;
+                    if (createOrgId == 0 || createOrgId == null)
+                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgId)?.Value);
+                }
+                else if (entityInfo.PropertyName == "CreateOrgName")
+                {
+                    var createOrgName = entityValue.CreateOrgName;
+                    if (string.IsNullOrEmpty(createOrgName))
+                        entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgName)?.Value);
+                }
+            }
+            // 编辑/更新
+            else if (entityInfo.OperationType == DataFilterType.UpdateByObject)
+            {
+                if (entityInfo.PropertyName == nameof(EntityBase.UpdateTime))
+                    entityInfo.SetValue(DateTime.Now);
+                else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserId))
+                    entityInfo.SetValue(App.User?.FindFirst(ClaimConst.UserId)?.Value);
+                else if (entityInfo.PropertyName == nameof(EntityBase.UpdateUserName))
+                    entityInfo.SetValue(App.User?.FindFirst(ClaimConst.RealName)?.Value);
+            }
+        };
+
+        // 是否为超级管理员
+        var isSuperAdmin = App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString();
+
+        // 配置假删除过滤器,如果当前用户是超级管理员并且允许忽略软删除过滤器则不会应用
+        if (!isSuperAdmin || !superAdminIgnoreIDeletedFilter)
+            db.QueryFilter.AddTableFilter<IDeletedFilter>(u => u.IsDelete == false);
+
+        // 超管排除其他过滤器
+        if (isSuperAdmin) return;
+
+        // 配置租户过滤器
+        var tenantId = App.User?.FindFirst(ClaimConst.TenantId)?.Value;
+        if (!string.IsNullOrWhiteSpace(tenantId))
+            db.QueryFilter.AddTableFilter<ITenantIdFilter>(u => u.TenantId == long.Parse(tenantId));
+
+        // 配置用户机构(数据范围)过滤器
+        SqlSugarFilter.SetOrgEntityFilter(db);
+
+        // 配置自定义过滤器
+        SqlSugarFilter.SetCustomEntityFilter(db);
+    }
+
+    /// <summary>
+    /// 开启库表差异化日志
+    /// </summary>
+    /// <param name="db"></param>
+    /// <param name="config"></param>
+    private static void SetDbDiffLog(SqlSugarScopeProvider db, DbConnectionConfig config)
+    {
+        if (!config.DbSettings.EnableDiffLog) return;
+
+        async void AopOnDiffLogEvent(DiffLogModel u)
+        {
+            // 记录差异数据
+            var diffData = new List<dynamic>();
+            for (int i = 0; i < u.AfterData.Count; i++)
+            {
+                var diffColumns = new List<dynamic>();
+                var afterColumns = u.AfterData[i].Columns;
+                var beforeColumns = u.BeforeData[i].Columns;
+                for (int j = 0; j < afterColumns.Count; j++)
+                {
+                    if (afterColumns[j].Value.Equals(beforeColumns[j].Value)) continue;
+                    diffColumns.Add(new
+                    {
+                        afterColumns[j].IsPrimaryKey,
+                        afterColumns[j].ColumnName,
+                        afterColumns[j].ColumnDescription,
+                        BeforeValue = beforeColumns[j].Value,
+                        AfterValue = afterColumns[j].Value,
+                    });
+                }
+
+                diffData.Add(new { u.AfterData[i].TableName, u.AfterData[i].TableDescription, Columns = diffColumns });
+            }
+
+            var logDiff = new SysLogDiff
+            {
+                // 差异数据(字段描述、列名、值、表名、表描述)
+                DiffData = JSON.Serialize(diffData),
+                // 传进来的对象(如果对象为空,则使用首个数据的表名作为业务对象)
+                BusinessData = u.BusinessData == null ? u.AfterData.FirstOrDefault()?.TableName : JSON.Serialize(u.BusinessData),
+                // 枚举(insert、update、delete)
+                DiffType = u.DiffType.ToString(),
+                Sql = u.Sql,
+                Parameters = JSON.Serialize(u.Parameters.Select(e => new { e.ParameterName, e.Value, TypeName = e.DbType.ToString() })),
+                Elapsed = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds
+            };
+            var logDb = ITenant.IsAnyConnection(SqlSugarConst.LogConfigId) ? ITenant.GetConnectionScope(SqlSugarConst.LogConfigId) : ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
+            await logDb.CopyNew().Insertable(logDiff).ExecuteCommandAsync();
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine(DateTime.Now + $"\r\n*****开始差异日志*****\r\n{Environment.NewLine}{JSON.Serialize(logDiff)}{Environment.NewLine}*****结束差异日志*****\r\n");
+        }
+
+        db.Aop.OnDiffLogEvent = AopOnDiffLogEvent;
+    }
+
+    /// <summary>
+    /// 初始化数据库
+    /// </summary>
+    /// <param name="db">SqlSugarScope 实例</param>
+    /// <param name="config">数据库连接配置</param>
+    private static void InitDatabase(SqlSugarScope db, DbConnectionConfig config)
+    {
+        var dbProvider = db.GetConnectionScope(config.ConfigId);
+
+        // 初始化数据库
+        if (config.DbSettings.EnableInitDb)
+        {
+            Log.Information($"初始化数据库 {config.DbType} - {config.ConfigId} - {config.ConnectionString}");
+            if (config.DbType != DbType.Oracle) dbProvider.DbMaintenance.CreateDatabase();
+        }
+
+        // 初始化表结构
+        if (config.TableSettings.EnableInitTable)
+        {
+            Log.Information($"初始化表结构 {config.DbType} - {config.ConfigId}");
+            var entityTypes = GetEntityTypesForInit(config);
+            InitializeTables(dbProvider, entityTypes, config);
+        }
+
+        // 初始化种子数据
+        if (config.SeedSettings.EnableInitSeed) InitSeedData(db, config);
+    }
+
+    /// <summary>
+    /// 获取需要初始化的实体类型
+    /// </summary>
+    /// <param name="config">数据库连接配置</param>
+    /// <returns>实体类型列表</returns>
+    private static List<Type> GetEntityTypesForInit(DbConnectionConfig config)
+    {
+        return App.EffectiveTypes
+            .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false))
+            .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any())
+            .WhereIF(config.TableSettings.EnableIncreTable, u => u.IsDefined(typeof(IncreTableAttribute), false))
+            .Where(u => IsEntityForConfig(u, config))
+            .ToList();
+    }
+
+    /// <summary>
+    /// 判断实体是否属于当前配置
+    /// </summary>
+    /// <param name="entityType">实体类型</param>
+    /// <param name="config">数据库连接配置</param>
+    /// <returns>是否属于当前配置</returns>
+    private static bool IsEntityForConfig(Type entityType, DbConnectionConfig config)
+    {
+        switch (config.ConfigId.ToString())
+        {
+            case SqlSugarConst.MainConfigId:
+                return entityType.GetCustomAttributes<SysTableAttribute>().Any() ||
+                       (!entityType.GetCustomAttributes<LogTableAttribute>().Any() &&
+                        !entityType.GetCustomAttributes<TenantAttribute>().Any());
+
+            case SqlSugarConst.LogConfigId:
+                return entityType.GetCustomAttributes<LogTableAttribute>().Any();
+
+            default:
+                {
+                    var tenantAttribute = entityType.GetCustomAttribute<TenantAttribute>();
+                    return tenantAttribute != null && tenantAttribute.configId.ToString() == config.ConfigId.ToString();
+                }
+        }
+    }
+
+    /// <summary>
+    /// 初始化表结构
+    /// </summary>
+    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
+    /// <param name="entityTypes">实体类型列表</param>
+    /// <param name="config">数据库连接配置</param>
+    private static void InitializeTables(SqlSugarScopeProvider dbProvider, List<Type> entityTypes, DbConnectionConfig config)
+    {
+        int count = 0, sum = entityTypes.Count;
+        var tasks = entityTypes.Select(entityType => Task.Run(() =>
+        {
+            Console.WriteLine($"初始化表结构 {entityType.FullName,-64} ({config.ConfigId} - {Interlocked.Increment(ref count):D003}/{sum:D003})");
+            UpdateNullableColumns(dbProvider, entityType);
+            InitializeTable(dbProvider, entityType);
+        }));
+
+        Task.WhenAll(tasks).GetAwaiter().GetResult();
+    }
+
+    /// <summary>
+    /// 更新表中不存在于实体的字段为可空
+    /// </summary>
+    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
+    /// <param name="entityType">实体类型</param>
+    private static void UpdateNullableColumns(SqlSugarScopeProvider dbProvider, Type entityType)
+    {
+        var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
+        var dbColumns = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? new List<DbColumnInfo>();
+
+        foreach (var dbColumn in dbColumns.Where(c => !c.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName != c.DbColumnName)))
+        {
+            dbColumn.IsNullable = true;
+            dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumn);
+        }
+    }
+
+    /// <summary>
+    /// 初始化表
+    /// </summary>
+    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
+    /// <param name="entityType">实体类型</param>
+    private static void InitializeTable(SqlSugarScopeProvider dbProvider, Type entityType)
+    {
+        if (entityType.GetCustomAttribute<SplitTableAttribute>() == null)
+        {
+            dbProvider.CodeFirst.InitTables(entityType);
+        }
+        else
+        {
+            dbProvider.CodeFirst.SplitTables().InitTables(entityType);
+        }
+    }
+
+    /// <summary>
+    /// 初始化种子数据
+    /// </summary>
+    /// <param name="db">SqlSugarScope 实例</param>
+    /// <param name="config">数据库连接配置</param>
+    private static void InitSeedData(SqlSugarScope db, DbConnectionConfig config)
+    {
+        var dbProvider = db.GetConnectionScope(config.ConfigId);
+        _isHandlingSeedData = true;
+
+        Log.Information($"初始化种子数据 {config.DbType} - {config.ConfigId}");
+        var seedDataTypes = GetSeedDataTypes(config);
+
+        int count = 0, sum = seedDataTypes.Count;
+        var tasks = seedDataTypes.Select(seedType => Task.Run(() =>
+        {
+            var entityType = seedType.GetInterfaces().First().GetGenericArguments().First();
+            if (!IsEntityForConfig(entityType, config)) return;
+
+            var seedData = GetSeedData(seedType);
+            if (seedData == null) return;
+
+            AdjustSeedDataIds(seedData, config);
+            InsertOrUpdateSeedData(dbProvider, seedType, entityType, seedData, config, ref count, sum);
+        }));
+
+        Task.WhenAll(tasks).GetAwaiter().GetResult();
+        _isHandlingSeedData = false;
+    }
+
+    /// <summary>
+    /// 获取种子数据类型
+    /// </summary>
+    /// <param name="config">数据库连接配置</param>
+    /// <returns>种子数据类型列表</returns>
+    private static List<Type> GetSeedDataTypes(DbConnectionConfig config)
+    {
+        return App.EffectiveTypes
+            .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.GetInterfaces().Any(i => i.HasImplementedRawGeneric(typeof(ISqlSugarEntitySeedData<>))))
+            .WhereIF(config.SeedSettings.EnableIncreSeed, u => u.IsDefined(typeof(IncreSeedAttribute), false))
+            .OrderBy(u => u.GetCustomAttributes(typeof(SeedDataAttribute), false).Length > 0 ? ((SeedDataAttribute)u.GetCustomAttributes(typeof(SeedDataAttribute), false)[0]).Order : 0)
+            .ToList();
+    }
+
+    /// <summary>
+    /// 获取种子数据
+    /// </summary>
+    /// <param name="seedType">种子数据类型</param>
+    /// <returns>种子数据列表</returns>
+    private static IEnumerable<object> GetSeedData(Type seedType)
+    {
+        var instance = Activator.CreateInstance(seedType);
+        var hasDataMethod = seedType.GetMethod("HasData");
+        return ((IEnumerable)hasDataMethod?.Invoke(instance, null))?.Cast<object>();
+    }
+
+    /// <summary>
+    /// 调整种子数据的 ID
+    /// </summary>
+    /// <param name="seedData">种子数据列表</param>
+    /// <param name="config">数据库连接配置</param>
+    private static void AdjustSeedDataIds(IEnumerable<object> seedData, DbConnectionConfig config)
+    {
+        var seedId = config.ConfigId.ToLong();
+        foreach (var data in seedData)
+        {
+            var idProperty = data.GetType().GetProperty(nameof(EntityBaseId.Id));
+            if (idProperty == null) continue;
+
+            var idValue = idProperty.GetValue(data);
+            if (idValue == null || idValue.ToString() == "0" || string.IsNullOrWhiteSpace(idValue.ToString()))
+            {
+                idProperty.SetValue(data, ++seedId);
+            }
+        }
+    }
+
+    /// <summary>
+    /// 插入或更新种子数据
+    /// </summary>
+    /// <param name="dbProvider">SqlSugarScopeProvider 实例</param>
+    /// <param name="seedType">种子数据类型</param>
+    /// <param name="entityType">实体类型</param>
+    /// <param name="seedData">种子数据列表</param>
+    /// <param name="config">数据库连接配置</param>
+    /// <param name="count">当前处理的数量</param>
+    /// <param name="sum">总数量</param>
+    private static void InsertOrUpdateSeedData(SqlSugarScopeProvider dbProvider, Type seedType, Type entityType, IEnumerable<object> seedData, DbConnectionConfig config, ref int count, int sum)
+    {
+        var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
+        var dataList = seedData.ToList();
+
+        if (entityType.GetCustomAttribute<SplitTableAttribute>(true) != null)
+        {
+            var initMethod = seedType.GetMethod("Init");
+            initMethod?.Invoke(Activator.CreateInstance(seedType), new object[] { dbProvider });
+        }
+        else
+        {
+            int updateCount = 0, insertCount = 0;
+            if (entityInfo.Columns.Any(u => u.IsPrimarykey))
+            {
+                var storage = dbProvider.StorageableByObject(dataList).ToStorage();
+                if (seedType.GetCustomAttribute<IgnoreUpdateSeedAttribute>() == null)
+                {
+                    updateCount = storage.AsUpdateable
+                        .IgnoreColumns(entityInfo.Columns
+                            .Where(u => u.PropertyInfo.GetCustomAttribute<IgnoreUpdateSeedColumnAttribute>() != null)
+                            .Select(u => u.PropertyName).ToArray())
+                        .ExecuteCommand();
+                }
+                insertCount = storage.AsInsertable.ExecuteCommand();
+            }
+            else
+            {
+                if (!dbProvider.Queryable(entityInfo.DbTableName, entityInfo.DbTableName).Any())
+                {
+                    insertCount = dataList.Count;
+                    dbProvider.InsertableByObject(dataList).ExecuteCommand();
+                }
+            }
+            Console.WriteLine($"添加数据 {entityInfo.DbTableName,-32} ({config.ConfigId} - {Interlocked.Increment(ref count):D003}/{sum:D003},数据量:{dataList.Count:D003},插入 {insertCount:D003} 条记录,修改 {updateCount:D003} 条记录)");
+        }
+    }
+
+    /// <summary>
+    /// 初始化租户业务数据库
+    /// </summary>
+    /// <param name="iTenant"></param>
+    /// <param name="config"></param>
+    public static void InitTenantDatabase(ITenant iTenant, DbConnectionConfig config)
+    {
+        SetDbConfig(config);
+
+        if (!iTenant.IsAnyConnection(config.ConfigId.ToString()))
+            iTenant.AddConnection(config);
+        var db = iTenant.GetConnectionScope(config.ConfigId.ToString());
+        db.DbMaintenance.CreateDatabase();
+
+        // 获取所有业务表-初始化租户库表结构(排除系统表、日志表、特定库表)
+        var entityTypes = App.EffectiveTypes
+            .Where(u => !u.GetCustomAttributes<IgnoreTableAttribute>().Any())
+            .Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(SugarTable), false) &&
+            !u.IsDefined(typeof(SysTableAttribute), false) && !u.IsDefined(typeof(LogTableAttribute), false) && !u.IsDefined(typeof(TenantAttribute), false)).ToList();
+        if (entityTypes.Count == 0) return;
+
+        foreach (var entityType in entityTypes)
+        {
+            var splitTable = entityType.GetCustomAttribute<SplitTableAttribute>();
+            if (splitTable == null)
+                db.CodeFirst.InitTables(entityType);
+            else
+                db.CodeFirst.SplitTables().InitTables(entityType);
+        }
+    }
 }

+ 1 - 2
Admin.NET/Admin.NET.Core/Utils/CodeGenUtil.cs

@@ -256,8 +256,7 @@ public static class CodeGenUtil
     {
         var columnList = new List<string>()
         {
-            nameof(EntityBaseData.CreateOrgId),
-            nameof(EntityBaseData.CreateOrgName),
+            nameof(EntityBaseData.OrgId),
             nameof(EntityTenant.TenantId),
             nameof(EntityBase.CreateTime),
             nameof(EntityBase.UpdateTime),

+ 0 - 11
Web/src/views/system/database/component/addTable.vue

@@ -243,17 +243,6 @@ function addBaseColumn() {
 			desc: '修改者姓名',
 			length: 64,
 		},
-		{
-			dataType: 'bigint',
-			name: 'CreateOrgId',
-			desc: '创建者部门Id',
-		},
-		{
-			dataType: 'varchar',
-			name: 'CreateOrgName',
-			desc: '创建者部门名称',
-			length: 64,
-		},
 		{
 			dataType: 'bit',
 			name: 'IsDelete',