diff --git a/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs b/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs index d2eaa58d..9f923135 100644 --- a/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs +++ b/Admin.NET/Admin.NET.Core/Entity/EntityBase.cs @@ -1,4 +1,4 @@ -// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // @@ -21,7 +21,7 @@ public abstract class EntityBaseId /// /// 框架实体基类 /// -[SugarIndex("index_{table}_CT", nameof(CreateTime), OrderByType.Asc)] +[SugarIndex("i_{table}_CT", nameof(CreateTime), OrderByType.Asc)] public abstract class EntityBase : EntityBaseId, IDeletedFilter { /// diff --git a/Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs b/Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs index 5913471d..d9228d90 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs @@ -11,9 +11,9 @@ namespace Admin.NET.Core; /// [SugarTable(null, "支付宝交易记录表")] [SysTable] -[SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)] -[SugarIndex("index_{table}_T", nameof(TradeNo), OrderByType.Asc)] -[SugarIndex("index_{table}_O", nameof(OutTradeNo), OrderByType.Asc)] +[SugarIndex("i_sysalipaytransaction_u", nameof(UserId), OrderByType.Asc)] +[SugarIndex("i_sysalipaytransaction_t", nameof(TradeNo), OrderByType.Asc)] +[SugarIndex("i_sysalipaytransaction_o", nameof(OutTradeNo), OrderByType.Asc)] public class SysAlipayTransaction : EntityBase { /// diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs index cee95ea7..2f3d7647 100644 --- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs +++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs @@ -348,7 +348,7 @@ public static class SqlSugarExtension // 将不存在实体中的字段改为可空 var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType); var dbColumnInfos = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? []; - foreach (var dbColumnInfo in dbColumnInfos.Where(dbColumnInfo => !dbColumnInfo.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName != dbColumnInfo.DbColumnName))) + foreach (var dbColumnInfo in dbColumnInfos.Where(dbColumnInfo => !dbColumnInfo.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName==null || u.DbColumnName.ToLower() != dbColumnInfo.DbColumnName.ToLower()))) { dbColumnInfo.IsNullable = true; dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumnInfo);