-修复 ZeroDbContext WhereDyanmicFilter DataRange bug;

This commit is contained in:
28810
2025-09-11 16:56:04 +08:00
parent a19fef313a
commit 6d77d67fc0

View File

@@ -734,8 +734,14 @@ namespace FreeSql.Extensions.ZeroEntity
foreach (var rm in replacedMap)
{
var find = $"{_selectProvider._tables[0].Alias}.{_common.QuoteSqlName(rm.Item1)}";
var idx = newWhere.IndexOf(find);
if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]")) newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
while (true)
{
var idx = newWhere.IndexOf(find);
if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]"))
newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
else
break;
}
}
return newWhere;