From 63ea706dcbeebf1722f7e04807904bd36dcf5106 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Fri, 12 Jul 2024 12:43:25 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=20Aop.ConfigEntity=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=AE=BE=E7=BD=AE=E8=A1=A8=E5=90=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9B#364=20#1835=20#1729=20#1542=20#1248=20#1247?=
 =?UTF-8?q?=20#407=20#387?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeSql.DbContext/FreeSql.DbContext.xml         |  9 +++++++++
 .../SelectProvider/Select0Provider.cs           | 17 +++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 6c9bef48..197e6480 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -826,5 +826,14 @@
             <param name="that"></param>
             <returns></returns>
         </member>
+        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
+            <summary>
+            批量注入 Repository，可以参考代码自行调整
+            </summary>
+            <param name="services"></param>
+            <param name="globalDataFilter"></param>
+            <param name="assemblies"></param>
+            <returns></returns>
+        </member>
     </members>
 </doc>
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
index 702891be..818dbedc 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -976,20 +976,21 @@ namespace FreeSql.Internal.CommonProvider
                 {
                     if (tb.Type == SelectTableInfoType.Parent) continue;
                     if (dict.ContainsKey(tb.Table.Type)) continue;
-                    var name = tr?.Invoke(tb.Table.Type, tb.Table.DbName);
-                    if (string.IsNullOrEmpty(name)) name = tb.Table.DbName;
+                    var tbname = _commonUtils.GetEntityTableAopName(tb.Table, true);
+                    var newname = tr?.Invoke(tb.Table.Type, tbname);
+                    if (string.IsNullOrEmpty(newname)) newname = tbname;
                     else
                     {
-                        if (name.IndexOf(' ') == -1) //还可以这样：select.AsTable((a, b) => "(select * from tb_topic where clicks > 10)").Page(1, 10).ToList()
+                        if (newname.IndexOf(' ') == -1) //还可以这样：select.AsTable((a, b) => "(select * from tb_topic where clicks > 10)").Page(1, 10).ToList()
                         {
-                            if (_orm.CodeFirst.IsSyncStructureToLower) name = name.ToLower();
-                            if (_orm.CodeFirst.IsSyncStructureToUpper) name = name.ToUpper();
-                            if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(tb.Table.Type, name);
+                            if (_orm.CodeFirst.IsSyncStructureToLower) newname = newname.ToLower();
+                            if (_orm.CodeFirst.IsSyncStructureToUpper) newname = newname.ToUpper();
+                            if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(tb.Table.Type, newname);
                         }
                         else
-                            name = name.Replace(" \r\n", " \r\n    ");
+                            newname = newname.Replace(" \r\n", " \r\n    ");
                     }
-                    dict.Add(tb.Table.Type, name);
+                    dict.Add(tb.Table.Type, newname);
                 }
                 unions.Add(dict);
             }