From 9f2c2380a22969a401fc91c15e115bb6d4acc50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= Date: Mon, 29 Sep 2025 17:31:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20PostgreSQL=20=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E7=AD=89=E9=80=89=E6=8B=A9=E5=AD=97=E6=AE=B5=E5=A4=84=EF=BC=8C?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E6=98=BE=E7=A4=BA=E4=B8=BA=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs index c2d10a39c..ff0cf5797 100644 --- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs +++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs @@ -215,6 +215,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient // 获取实体类型属性 var entityType = provider.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == tableName); if (entityType == null) return null; + var ppppp = GetEntityInfos(configId).Result.First(e => e.DbTableName.EndsWithIgnoreCase(tableName)).Type.GetProperties(); var properties = GetEntityInfos(configId).Result.First(e => e.DbTableName.EndsWithIgnoreCase(tableName)).Type.GetProperties() .Where(e => e.GetCustomAttribute()?.IsIgnore == false).Select(e => new { @@ -233,7 +234,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient }).ToList(); foreach (var column in columnList) { - var property = properties.FirstOrDefault(e => (config!.DbSettings.EnableUnderLine ? e.ColumnName.ToUnderLine() : e.ColumnName) == column.ColumnName); + // ToLowerInvariant 将字段名转成小写再比较，避免因大小写不一致导致无法匹配(pgsql创建表会默认全小写,而我们的实体中又是大写,就会匹配不上) + var property = properties.FirstOrDefault(e => (config!.DbSettings.EnableUnderLine ? e.ColumnName.ToUnderLine() : e.ColumnName).ToLowerInvariant() == column.ColumnName.ToLowerInvariant()); column.ColumnComment ??= property?.ColumnComment; column.PropertyName = property?.PropertyName; } -- Gitee From 8d47856edfad53ca7aa8c935dfa865cdd8e903aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E9=B9=B0?= Date: Mon, 29 Sep 2025 17:44:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs index ff0cf5797..40917cea2 100644 --- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs +++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs @@ -215,7 +215,6 @@ public class SysCodeGenService : IDynamicApiController, ITransient // 获取实体类型属性 var entityType = provider.DbMaintenance.GetTableInfoList(false).FirstOrDefault(u => u.Name == tableName); if (entityType == null) return null; - var ppppp = GetEntityInfos(configId).Result.First(e => e.DbTableName.EndsWithIgnoreCase(tableName)).Type.GetProperties(); var properties = GetEntityInfos(configId).Result.First(e => e.DbTableName.EndsWithIgnoreCase(tableName)).Type.GetProperties() .Where(e => e.GetCustomAttribute()?.IsIgnore == false).Select(e => new { -- Gitee