From e0bc05cd0a0d4fa67fa60e67a6399971017a5e32 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Wed, 28 Jun 2017 12:14:37 +0800
Subject: [PATCH] Update Core

---
 .../ResolveItems/ConstantExpressionResolve.cs      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs
index cb9fb56b8..1bda1f732 100644
--- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs
+++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/ConstantExpressionResolve.cs
@@ -38,10 +38,18 @@ namespace SqlSugar
                             this.Context.Result.Append(value.ObjToBool() ? "( 1 = 1 ) " : "( 1 = 2 ) ");
                             break;
                         }
-                        if (parentIsBinary && value != null && value.GetType() == PubConst.BoolType && parameter.OppsiteExpression is BinaryExpression)
+                        if (parentIsBinary && value != null && value.GetType() == PubConst.BoolType && parameter.BaseExpression != null)
                         {
-                            AppendMember(parameter,isLeft,(value.ObjToBool() ? "( 1 = 1 ) " : "( 1 = 2 ) "));
-                            break;
+                            var isLogicOperator =
+                               parameter.BaseExpression.NodeType == ExpressionType.And ||
+                               parameter.BaseExpression.NodeType == ExpressionType.AndAlso ||
+                               parameter.BaseExpression.NodeType == ExpressionType.Or ||
+                               parameter.BaseExpression.NodeType == ExpressionType.OrElse;
+                            if (isLogicOperator)
+                            {
+                                AppendMember(parameter, isLeft, (value.ObjToBool() ? "( 1 = 1 ) " : "( 1 = 2 ) "));
+                                break;
+                            }
                         }
                         if (value == null && parentIsBinary)
                         {