lichunlei 4 месяцев назад
Родитель
Сommit
2d47cfbbfe
2 измененных файлов с 34 добавлено и 6 удалено
  1. 16 0
      Model/Database/ApiInfo.cs
  2. 18 6
      Services/DatabaseTableService.cs

+ 16 - 0
Model/Database/ApiInfo.cs

@@ -281,6 +281,22 @@ namespace Model
         /// 关联表ID
         /// 关联表ID
         /// </summary>
         /// </summary>
         public int linkTableId { get; set; }
         public int linkTableId { get; set; }
+        public string? linkTableTitle { get; set; } 
+        public string? linkTableName { get; set; } 
+        public string? linkTableNameUpper
+        {
+            get
+            {
+                return PublicFunction.transferName(linkTableName);
+            }
+        }
+        public string? linkTableNameFirstUpper
+        {
+            get
+            {
+                return PublicFunction.transferName(linkTableName, 1);
+            }
+        }
 
 
 
 
         /// <summary>
         /// <summary>

+ 18 - 6
Services/DatabaseTableService.cs

@@ -246,9 +246,15 @@ namespace Services
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.linkTableId == table.id && m.apiKind == 1);
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.linkTableId == table.id && m.apiKind == 1);
             foreach(ApiInfo apiInfo in apiInfos)
             foreach(ApiInfo apiInfo in apiInfos)
             {
             {
-                var linkTable = GetFirst(m => m.id == apiInfo.linkTableId) ?? new DatabaseTable();
-                apiInfo.linkTableTitle = linkTable.tableTitle;
-                apiInfo.linkTableName = linkTable.tableName;
+                foreach(var param in apiInfo.apiParam)
+                {
+                    if(param.linkTableId > 0)
+                    {
+                        var linkTable = GetFirst(m => m.id == param.linkTableId) ?? new DatabaseTable();
+                        param.linkTableTitle = linkTable.tableTitle;
+                        param.linkTableName = linkTable.tableName;
+                    }
+                }
             }
             }
 
 
             Dictionary<string, object> pushData = new Dictionary<string, object>();
             Dictionary<string, object> pushData = new Dictionary<string, object>();
@@ -270,9 +276,15 @@ namespace Services
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.linkTableId == table.id && m.apiKind == 1);
             var apiInfos = _ApiInfoService.GetList(m => m.serviceId == baseInfo.id && m.linkTableId == table.id && m.apiKind == 1);
             foreach(ApiInfo apiInfo in apiInfos)
             foreach(ApiInfo apiInfo in apiInfos)
             {
             {
-                var linkTable = GetFirst(m => m.id == apiInfo.linkTableId) ?? new DatabaseTable();
-                apiInfo.linkTableTitle = linkTable.tableTitle;
-                apiInfo.linkTableName = linkTable.tableName;
+                foreach(var param in apiInfo.apiParam)
+                {
+                    if(param.linkTableId > 0)
+                    {
+                        var linkTable = GetFirst(m => m.id == param.linkTableId) ?? new DatabaseTable();
+                        param.linkTableTitle = linkTable.tableTitle;
+                        param.linkTableName = linkTable.tableName;
+                    }
+                }
             }
             }
 
 
             Dictionary<string, object> pushData = new Dictionary<string, object>();
             Dictionary<string, object> pushData = new Dictionary<string, object>();