This commit is contained in:
sunkaixuan
2017-09-15 16:12:05 +08:00
parent d7b714f530
commit 0317ba1263

View File

@@ -31,21 +31,21 @@ namespace SqlSugar
if (isLength) if (isLength)
{ {
ResolveLength(parameter, isLeft, expression);return; ResolveLength(parameter, isLeft, expression); return;
} }
else if (isHasValue) else if (isHasValue)
{ {
ResolveHasValue(parameter, expression);return; ResolveHasValue(parameter, expression); return;
} }
else if (isDateValue) else if (isDateValue)
{ {
ResolveDateValue(parameter, isLeft, expression);return; ResolveDateValue(parameter, isLeft, expression); return;
} }
else if (isValueBool){isValue = false;} else if (isValueBool) { isValue = false; }
else if (isValue){expression = expression.Expression as MemberExpression;} else if (isValue) { expression = expression.Expression as MemberExpression; }
else if (isDateDate) else if (isDateDate)
{ {
ResolveDateDate(parameter, isLeft, expression);return; ResolveDateDate(parameter, isLeft, expression); return;
} }
else if (isMemberValue) else if (isMemberValue)
{ {
@@ -76,29 +76,27 @@ namespace SqlSugar
{ {
fieldName = GetName(parameter, expression, null, isSingle); fieldName = GetName(parameter, expression, null, isSingle);
baseParameter.CommonTempData = fieldName; baseParameter.CommonTempData = fieldName;
break;
}
if (isValueBool)
{
fieldName = GetName(parameter, expression.Expression as MemberExpression, isLeft, isSingle);
}
else if (ExpressionTool.IsConstExpression(expression))
{
var value = ExpressionTool.GetMemberValue(expression.Member, expression);
base.AppendValue(parameter, isLeft, value);
return;
} }
else else
{ {
if (isValueBool) fieldName = GetName(parameter, expression, isLeft, isSingle);
{
fieldName = GetName(parameter, expression.Expression as MemberExpression, isLeft, isSingle);
}
else if (ExpressionTool.IsConstExpression(expression))
{
var value = ExpressionTool.GetMemberValue(expression.Member, expression);
base.AppendValue(parameter, isLeft, value);
return;
}
else
{
fieldName = GetName(parameter, expression, isLeft, isSingle);
}
if (expression.Type == UtilConstants.BoolType && baseParameter.OperatorValue.IsNullOrEmpty())
{
fieldName = "( " + fieldName + "=1 )";
}
fieldName = AppendMember(parameter, isLeft, fieldName);
} }
if (expression.Type == UtilConstants.BoolType && baseParameter.OperatorValue.IsNullOrEmpty())
{
fieldName = "( " + fieldName + "=1 )";
}
fieldName = AppendMember(parameter, isLeft, fieldName);
break; break;
case ResolveExpressType.FieldSingle: case ResolveExpressType.FieldSingle:
fieldName = GetSingleName(parameter, expression, isLeft); fieldName = GetSingleName(parameter, expression, isLeft);
@@ -294,7 +292,7 @@ namespace SqlSugar
} }
}; };
return this.Context.DbMehtods.ToDate(pars); return this.Context.DbMehtods.ToDate(pars);
} }
#endregion #endregion
} }
} }