From 753c7a06e9d0c6830cc0972b5845c8aef85c56ff Mon Sep 17 00:00:00 2001 From: yzp Date: Thu, 5 Jun 2025 14:19:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG:=E5=A6=82=E6=9E=9C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=88=90=E4=B8=8B=E5=88=92=E7=BA=BF=E5=88=86=E5=89=B2=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=EF=BC=8C=E7=84=B6=E5=AF=BC=E8=87=B4=E5=9C=A8?= =?UTF-8?q?oracle=E4=B8=AD=E7=B4=A2=E5=BC=95=E5=90=8D=E7=A7=B0=E5=A4=AA?= =?UTF-8?q?=E9=95=BF=E3=80=82=E6=89=80=E4=BB=A5=E8=BF=99=E9=87=8C=E8=A6=81?= =?UTF-8?q?=E5=B0=BD=E9=87=8F=E7=9F=AD=E4=B8=80=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Entity/EntityBase.cs | 4 ++-- Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 { /// From 1895ab0a75b333cfa19784ef2c957eb7c2bd2942 Mon Sep 17 00:00:00 2001 From: yzp Date: Thu, 5 Jun 2025 14:19:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BUG:Oracle=E4=B8=AD=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E5=85=A8=E6=98=AF=E5=A4=A7=E5=86=99=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E5=AF=BC=E8=87=B4=E6=AF=8F=E6=AC=A1=E9=83=BD?= =?UTF-8?q?=E4=BC=9A=E4=BF=AE=E6=94=B9=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);