Commit b593da69 authored by thienvo's avatar thienvo

optimize sieve

parent e83893c6
...@@ -233,14 +233,19 @@ namespace Sieve.Services ...@@ -233,14 +233,19 @@ namespace Sieve.Services
{ {
innerExpression = Expression.Or(innerExpression, expression); innerExpression = Expression.Or(innerExpression, expression);
} }
if (!string.IsNullOrEmpty(dynamicQuery))
{
dynamicQuery = GetDynamicQueryString(filterTerm, dynamicQuery.ToString(), filterValue.ToString()); dynamicQuery = GetDynamicQueryString(filterTerm, dynamicQuery.ToString(), filterValue.ToString());
}
} }
} }
} }
if (!string.IsNullOrEmpty(dynamicQuery))
{
if (string.IsNullOrEmpty(dynamicQuery1)) if (string.IsNullOrEmpty(dynamicQuery1))
{ {
dynamicQuery1 = "(" + dynamicQuery + ")"; dynamicQuery1 = "(" + dynamicQuery + ")";
...@@ -249,6 +254,8 @@ namespace Sieve.Services ...@@ -249,6 +254,8 @@ namespace Sieve.Services
{ {
dynamicQuery1 += " or " + "(" + dynamicQuery + ")"; dynamicQuery1 += " or " + "(" + dynamicQuery + ")";
} }
}
if (outerExpression == null) if (outerExpression == null)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment