|
@ -27,36 +27,25 @@ namespace SqlSugar |
|
|
var isDateDate = expression.Member.Name == "Date" && expression.Expression.Type == UtilConstants.DateType; |
|
|
var isDateDate = expression.Member.Name == "Date" && expression.Expression.Type == UtilConstants.DateType; |
|
|
if (isLength) |
|
|
if (isLength) |
|
|
{ |
|
|
{ |
|
|
ResolveLength(parameter, isLeft, expression); |
|
|
ResolveLength(parameter, isLeft, expression);return; |
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
else if (isHasValue) |
|
|
else if (isHasValue) |
|
|
{ |
|
|
{ |
|
|
ResolveHasValue(parameter, expression); |
|
|
ResolveHasValue(parameter, expression);return; |
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
else if (isDateValue) |
|
|
else if (isDateValue) |
|
|
{ |
|
|
{ |
|
|
ResolveDateValue(parameter, isLeft, expression); |
|
|
ResolveDateValue(parameter, isLeft, expression);return; |
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
else if (isValueBool) |
|
|
|
|
|
{ |
|
|
|
|
|
isValue = false; |
|
|
|
|
|
} |
|
|
|
|
|
else if (isValue) |
|
|
|
|
|
{ |
|
|
|
|
|
expression = expression.Expression as MemberExpression; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
else if (isValueBool){isValue = false;} |
|
|
|
|
|
else if (isValue){expression = expression.Expression as MemberExpression;} |
|
|
else if (isDateDate) |
|
|
else if (isDateDate) |
|
|
{ |
|
|
{ |
|
|
ResolveDateDate(parameter, isLeft, expression); |
|
|
ResolveDateDate(parameter, isLeft, expression);return; |
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
else if (isDateTimeNowDate) |
|
|
else if (isDateTimeNowDate) |
|
|
{ |
|
|
{ |
|
|
AppendValue(parameter, isLeft, DateTime.Now.Date); |
|
|
AppendValue(parameter, isLeft, DateTime.Now.Date); return; |
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
else if (expression.Expression != null && expression.Expression.NodeType != ExpressionType.Parameter && !isValueBool) |
|
|
else if (expression.Expression != null && expression.Expression.NodeType != ExpressionType.Parameter && !isValueBool) |
|
|
{ |
|
|
{ |
|
|