From 5bf63b3a8c60bed6c32a13eb9f1e4ec41479e1a0 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Wed, 18 Dec 2024 17:51:10 +0800
Subject: [PATCH] Update query filter

---
 .../Abstract/SqlBuilderProvider/QueryBuilder.cs       | 11 +++++++++--
 Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec      |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
index 9002bca3d..f49cc18f2 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
@@ -466,17 +466,24 @@ namespace SqlSugar
                         {
                             var addSql = mysql.Replace(itName, this.Builder.GetTranslationColumnName(joinInfoItem.ShortName) + ".");
                             addSql = ReplaceFilterColumnName(addSql, joinInfoItem.EntityType,joinInfoItem.ShortName);
-                            joinInfoItem.JoinWhere += (" AND " + Regex.Replace(addSql, "^ (WHERE|AND) ", ""));
+                            joinInfoItem.JoinWhere += ( " AND " + Regex.Replace(addSql, "^ (WHERE|AND) ", ""));
                         }
                     }
                     else if (ChildType.IsInterface && item.IsJoinQuery == false)
                     {
+                        {
+                            var addSql = mysql.Replace(itName, this.Builder.GetTranslationColumnName(TableShortName) + ".");
+                            addSql = ReplaceFilterColumnName(addSql, EntityType, TableShortName);
+                            var andOrWhere = this.WhereInfos.Any() ? " AND " : "WHERE";
+                            this.WhereInfos.Add(andOrWhere + Regex.Replace(addSql, "^ (WHERE|AND) ", ""));
+                        }
                         foreach (var joinInfoItem in this.JoinQueryInfos.Where(it => it.EntityType.GetInterfaces().Any(z => z == ChildType)))
                         {
                             var addSql = mysql.Replace(itName, this.Builder.GetTranslationColumnName(joinInfoItem.ShortName) + ".");
                             addSql = ReplaceFilterColumnName(addSql, joinInfoItem.EntityType, joinInfoItem.ShortName);
                             this.WhereInfos.Add (" AND " + Regex.Replace(addSql, "^ (WHERE|AND) ", ""));
-                        }
+                        } 
+                        return;
                     }
                     else
                     {
diff --git a/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
index 8ee2d1977..5d625ea75 100644
--- a/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
+++ b/Src/Asp.NetCore2/SqlSugar/SqlSugarForCore.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SqlSugarCore</id>
-    <version>5.1.4.172-preview01</version>
+    <version>5.1.4.172-preview08</version>
     <authors>sunkaixuan</authors>
     <owners>果糖大数据科技</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>