From dec2904a85f69fb89728b0f07c7691ec56640aac Mon Sep 17 00:00:00 2001
From: ky_yusj <2655568377@qq.com>
Date: Mon, 31 May 2021 15:54:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8A=A8=E6=80=81=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2page=E5=A2=9E=E5=8A=A0=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extension/DataFilter/Entity/FilterInfo.cs  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs b/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs
index 1e3567e..a7087be 100644
--- a/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs
+++ b/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs
@@ -36,12 +36,12 @@ namespace Ewide.Core.Extension.DataFilter.Entity
 		{
 			try
 			{
-				foreach(var field in filterFields)
-                {
-					var elem = searchInfo.FirstOrDefault(m => m.Field.Equals(field,StringComparison.OrdinalIgnoreCase));
-					if (elem == null) continue;
-
+				foreach (var elem in searchInfo)
+				{
 					var fieldName = elem.Field;
+
+					if (filterFields.FirstOrDefault(m => m.Equals(fieldName, StringComparison.OrdinalIgnoreCase)) == null) continue;
+
 					var searchStrs = elem.Value;
 					if (searchStrs == null) continue;
 					if (searchStrs.Count == 0) continue;
@@ -52,11 +52,11 @@ namespace Ewide.Core.Extension.DataFilter.Entity
 					var searchStrsNode = elem.Value;
 					if (searchStrsNode != null)
 					{
-						foreach (var node in searchStrsNode)
-						{
+                        foreach (var node in searchStrsNode)
+                        {
 							searchInfoEntity.Value.Add(node);
-						}
-					}
+                        }
+                    }
 					_SearchInfos.Add(searchInfoEntity);
 				}
 			}