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

Merge pull request 'fix: 😀修复PostgreSQL字段名默认小写导致获取不到字段列表的问题' (#229) from jasondom/Admin.NET.Pro:v2 into v2

Browse Source 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/229
This commit is contained in:
zuohuaijun 2025-01-15 16:17:48 +08:00
commit 99a122ba86
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
View File

@ -5,6 +5,7 @@
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
using System.IO.Compression;
using DbType = SqlSugar.DbType;
namespace Admin.NET.Core.Service;
@ -232,7 +233,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
{
PropertyName = u.Name,
ColumnComment = u.GetCustomAttribute<SugarColumn>()?.ColumnDescription,
ColumnName = GetRealColumnName(u.GetCustomAttribute<SugarColumn>()?.ColumnName) ?? u.Name
ColumnName = GetRealColumnName(u.GetCustomAttribute<SugarColumn>()?.ColumnName ?? u.Name)
}).ToList();
// 按原始类型的顺序获取所有实体类型属性（不包含导航属性，会返回null）
@ -261,11 +262,9 @@ public class SysCodeGenService : IDynamicApiController, ITransient
string GetRealColumnName(string name)
{
if (string.IsNullOrWhiteSpace(name))
{
return null;
}
if (string.IsNullOrWhiteSpace(name)) return null;
string realName = config!.DbSettings.EnableUnderLine ? CodeGenUtil.CamelColumnName(name, entityBasePropertyNames) : name;
if (config.DbType == DbType.PostgreSQL) realName = realName.ToLower();
return realName;
}
}