Browse Source

修复启用驼峰下划线后(EnableUnderLine)代码生成字段配置(sys_code_gen_config)无法入库的问题

caomei sun 3 years ago
parent
commit
28b52141de
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -176,9 +176,9 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var entityType = _commonService.GetEntityInfos().Result.FirstOrDefault(m => m.EntityName == input.TableName);
         var entityType = _commonService.GetEntityInfos().Result.FirstOrDefault(m => m.EntityName == input.TableName);
         if (entityType == null)
         if (entityType == null)
             return null;
             return null;
-
+        var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId == input.ConfigId);
         var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
         var entityBasePropertyNames = _codeGenOptions.EntityBaseColumn[nameof(EntityTenant)];
-        return provider.DbMaintenance.GetColumnInfosByTableName(entityType.DbTableName, false).Select(u => new ColumnOuput
+        return provider.DbMaintenance.GetColumnInfosByTableName(config.EnableUnderLine ? UtilMethods.ToUnderLine(entityType.DbTableName) : entityType.DbTableName, false).Select(u => new ColumnOuput
         {
         {
             ColumnName = CodeGenUtil.CamelColumnName(u.DbColumnName, entityBasePropertyNames),
             ColumnName = CodeGenUtil.CamelColumnName(u.DbColumnName, entityBasePropertyNames),
             ColumnKey = u.IsPrimarykey.ToString(),
             ColumnKey = u.IsPrimarykey.ToString(),