Просмотр исходного кода

获取数据库表(实体)集合时直接返回实际表名,避免后面接口获取不到列名

Signed-off-by: skywolf627 <skywolf627@qq.com>
skywolf627 3 лет назад
Родитель
Сommit
91d9da87cd
1 измененных файлов с 21 добавлено и 6 удалено
  1. 21 6
      Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

+ 21 - 6
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -137,13 +137,28 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         var dbTableNames = dbTableInfos.Select(u => u.Name.ToLower()).ToList();
         IEnumerable<EntityInfo> entityInfos = await _commonService.GetEntityInfos();
-        return entityInfos.Where(u => dbTableNames.Contains(config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName.ToLower())).Select(u => new TableOutput()
+
+        var tableOutputList = new List<TableOutput>();
+        foreach (var item in entityInfos)
         {
-            ConfigId = configId,
-            EntityName = u.EntityName,
-            TableName = config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName,
-            TableComment = u.TableDescription
-        }).ToList();
+            var table = dbTableInfos.FirstOrDefault(x => x.Name.ToLower() == (config.EnableUnderLine ? UtilMethods.ToUnderLine(item.DbTableName) : item.DbTableName.ToLower()));
+            if (table == null) continue;
+            tableOutputList.Add(new TableOutput
+            {
+                ConfigId = configId,
+                EntityName = item.EntityName,
+                TableName = table.Name, //返回实际表名,避免后面接口获取不到列名
+                TableComment = item.TableDescription
+            });
+        }
+        return tableOutputList;
+        //return entityInfos.Where(u => dbTableNames.Contains(config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName.ToLower())).Select(u => new TableOutput()
+        //{
+        //    ConfigId = configId,
+        //    EntityName = u.EntityName,
+        //    TableName = config.EnableUnderLine ? UtilMethods.ToUnderLine(u.DbTableName) : u.DbTableName,
+        //    TableComment = u.TableDescription
+        //}).ToList();
     }
 
     /// <summary>