tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 全局过滤器禁用时子查询传播问题；#1208

Browse Source
This commit is contained in:
2881099
2022-08-09 19:11:24 +08:00
parent 081953a4c1
commit f042ea46bb
4 changed files with 190 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
FreeSql/Internal/CommonExpression.cs
View File

@ -1241,14 +1241,8 @@ namespace FreeSql.Internal
}
if (tsc.whereGlobalFilter != null)
{
if (tsc.whereGlobalFilter.Any() == false)
fsqlSelect0._whereGlobalFilter.Clear();
else
{
var fsqlGlobalFilter = fsqlSelect0._whereGlobalFilter;
if (fsqlGlobalFilter != tsc.whereGlobalFilter)
fsqlGlobalFilter.AddRange(tsc.whereGlobalFilter.Where(b => !fsqlGlobalFilter.Any(a => a.Name == b.Name)));
}
fsqlSelect0._whereGlobalFilter.Clear();
if (tsc.whereGlobalFilter.Any()) fsqlSelect0._whereGlobalFilter.AddRange(tsc.whereGlobalFilter);
}
}
else if (fsqlType != null)
@ -2375,14 +2369,8 @@ namespace FreeSql.Internal
if (tableRule != null) midSelect._tableRules.Add(tableRule);
if (whereGlobalFilter != null)
{
if (whereGlobalFilter.Any() == false)
midSelect._whereGlobalFilter.Clear();
else
{
var fsqlGlobalFilter = midSelect._whereGlobalFilter;
if (fsqlGlobalFilter != whereGlobalFilter)
fsqlGlobalFilter.AddRange(whereGlobalFilter.Where(b => !fsqlGlobalFilter.Any(a => a.Name == b.Name)));
}
midSelect._whereGlobalFilter.Clear();
if (whereGlobalFilter.Any()) midSelect._whereGlobalFilter.AddRange(whereGlobalFilter);
}
switch (commonExp._ado.DataType)
{
@ -2443,14 +2431,8 @@ namespace FreeSql.Internal
if (tableRule != null) select._tableRules.Add(tableRule);
if (whereGlobalFilter != null)
{
if (whereGlobalFilter.Any() == false)
select._whereGlobalFilter.Clear();
else
{
var fsqlGlobalFilter = select._whereGlobalFilter;
if (fsqlGlobalFilter != whereGlobalFilter)
fsqlGlobalFilter.AddRange(whereGlobalFilter.Where(b => !fsqlGlobalFilter.Any(a => a.Name == b.Name)));
}
select._whereGlobalFilter.Clear();
if (whereGlobalFilter.Any()) select._whereGlobalFilter.AddRange(whereGlobalFilter);
}
}
while (true)