Skip to content

Commit 6d77d67

Browse files
committed
-修复 ZeroDbContext WhereDyanmicFilter DataRange bug;
1 parent a19fef3 commit 6d77d67

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,14 @@ string ParseDynamicFilter(DynamicFilterInfo filter)
734734
foreach (var rm in replacedMap)
735735
{
736736
var find = $"{_selectProvider._tables[0].Alias}.{_common.QuoteSqlName(rm.Item1)}";
737-
var idx = newWhere.IndexOf(find);
738-
if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]")) newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
737+
while (true)
738+
{
739+
var idx = newWhere.IndexOf(find);
740+
if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]"))
741+
newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
742+
else
743+
break;
744+
}
739745
}
740746
return newWhere;
741747

0 commit comments

Comments
 (0)