gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Oracle下的BUG' (#354) from koy07555/Admin.NET.Pro:Oracle下的BUG into v2

Browse Source 
Reviewed-on: https://code.adminnet.top/Admin.NET/Admin.NET.Pro/pulls/354
This commit is contained in:
zuohuaijun 2025-06-05 19:01:30 +08:00
commit 34930dc6b1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Core/Entity/EntityBase.cs
View File

@ -1,4 +1,4 @@
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
// //
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
// //
@ -21,7 +21,7 @@ public abstract class EntityBaseId
/// <summary> /// <summary>
/// 框架实体基类 /// 框架实体基类
/// </summary> /// </summary>
[SugarIndex("index_{table}_CT", nameof(CreateTime), OrderByType.Asc)] [SugarIndex("i_{table}_CT", nameof(CreateTime), OrderByType.Asc)]
public abstract class EntityBase : EntityBaseId, IDeletedFilter public abstract class EntityBase : EntityBaseId, IDeletedFilter
{ {
/// <summary> /// <summary>

6
Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs
View File

@ -11,9 +11,9 @@ namespace Admin.NET.Core;
/// </summary> /// </summary>
[SugarTable(null, "支付宝交易记录表")] [SugarTable(null, "支付宝交易记录表")]
[SysTable] [SysTable]
[SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)] [SugarIndex("i_sysalipaytransaction_u", nameof(UserId), OrderByType.Asc)]
[SugarIndex("index_{table}_T", nameof(TradeNo), OrderByType.Asc)] [SugarIndex("i_sysalipaytransaction_t", nameof(TradeNo), OrderByType.Asc)]
[SugarIndex("index_{table}_O", nameof(OutTradeNo), OrderByType.Asc)] [SugarIndex("i_sysalipaytransaction_o", nameof(OutTradeNo), OrderByType.Asc)]
public class SysAlipayTransaction : EntityBase public class SysAlipayTransaction : EntityBase
{ {
/// <summary> /// <summary>

2
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarExtension.cs
View File

@ -348,7 +348,7 @@ public static class SqlSugarExtension
// 将不存在实体中的字段改为可空 // 将不存在实体中的字段改为可空
var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType); var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
var dbColumnInfos = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? []; 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; dbColumnInfo.IsNullable = true;
dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumnInfo); dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumnInfo);