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);
 				}
 			}