lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 08:19:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #I9UK5G 资源管理的查询报错

Browse Source
This commit is contained in:
wintel 2024-06-13 20:19:40 +08:00
parent 35ff148b68
commit 8dfca5254d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Infrastructure/DynamicLinq.cs
View File

@ -254,38 +254,38 @@ namespace Infrastructure
}
else //or
{
return result.Or(gresult);
return Expression.OrElse( result, gresult);
}
}
/// <summary>
/// 转换FilterGroup[]为表达式，不管FilterGroup里面的Filters
/// </summary>
/// <param name="groups"></param>
/// <param name="queryObjs"></param>
/// <param name="param"></param>
/// <param name="operation"></param>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
private static Expression ConvertGroup<T>(QueryObject[] groups, ParameterExpression param, string operation)
private static Expression ConvertGroup<T>(QueryObject[] queryObjs, ParameterExpression param, string operation)
{
if (groups == null || !groups.Any()) return null;
if (queryObjs == null || !queryObjs.Any()) return null;
Expression result = ConvertGroup<T>(groups[0], param);
Expression result = ConvertGroup<T>(queryObjs[0], param);
if (groups.Length == 1) return result;
if (queryObjs.Length == 1) return result;
if (operation == "and")
{
foreach (var filter in groups.Skip(1))
foreach (var filter in queryObjs.Skip(1))
{
result = result.AndAlso(ConvertGroup<T>(filter, param));
}
}
else
{
foreach (var filter in groups.Skip(1))
foreach (var filter in queryObjs.Skip(1))
{
result = result.Or(ConvertGroup<T>(filter, param));
result = Expression.OrElse(result, ConvertGroup<T>(filter, param));
}
}
@ -325,7 +325,7 @@ namespace Infrastructure
{
foreach (var filter in filters.Skip(1))
{
result = result.Or(param.GenerateBody<T>(filter));
result = Expression.OrElse(result, param.GenerateBody<T>(filter));
}
}