From 8dfca5254d4c534e7d7e2f4afab7a5df237028d8 Mon Sep 17 00:00:00 2001
From: wintel <yubaolee@163.com>
Date: Thu, 13 Jun 2024 20:19:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#I9UK5G=20=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Infrastructure/DynamicLinq.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Infrastructure/DynamicLinq.cs b/Infrastructure/DynamicLinq.cs
index f1c3d9d7..dc2af051 100644
--- a/Infrastructure/DynamicLinq.cs
+++ b/Infrastructure/DynamicLinq.cs
@@ -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));
                 }
             }