Update Mapper

This commit is contained in:
skx 2021-01-01 15:21:23 +08:00
parent 2ef8e14522
commit 919cd24cbd
2 changed files with 19 additions and 14 deletions

View File

@ -133,20 +133,8 @@ namespace SqlSugar
if (parameter.BaseExpression is BinaryExpression || parameter.BaseExpression == null)
{
var oppoSiteExpression = isLeft == true ? parameter.BaseParameter.RightExpression : parameter.BaseParameter.LeftExpression;
if (parameter.CurrentExpression is MethodCallExpression || parameter.CurrentExpression is ConditionalExpression || parameter.CurrentExpression.NodeType == ExpressionType.Coalesce)
{
var appendValue = value;
if (this.Context.Result.Contains(ExpressionConst.FormatSymbol))
{
this.Context.Result.Replace(ExpressionConst.FormatSymbol, appendValue.ObjToString());
}
else
{
this.Context.Result.Append(appendValue);
}
this.AppendOpreator(parameter, isLeft);
}
else if (value is MapperSql)
if (value is MapperSql)
{
var sql = ((MapperSql)value).Sql;
if (isLeft == true)
@ -162,6 +150,19 @@ namespace SqlSugar
this.Context.Result.Append(sql);
}
}
else if(parameter.CurrentExpression is MethodCallExpression || parameter.CurrentExpression is ConditionalExpression || parameter.CurrentExpression.NodeType == ExpressionType.Coalesce)
{
var appendValue = value;
if (this.Context.Result.Contains(ExpressionConst.FormatSymbol))
{
this.Context.Result.Replace(ExpressionConst.FormatSymbol, appendValue.ObjToString());
}
else
{
this.Context.Result.Append(appendValue);
}
this.AppendOpreator(parameter, isLeft);
}
else if (oppoSiteExpression is MemberExpression)
{
string appendValue = Context.SqlParameterKeyWord

View File

@ -245,6 +245,10 @@ namespace SqlSugar
var value = ExpressionTool.GetMemberValue(expression.Member, expression);
if (isSetTempData)
{
if (value is MapperSql)
{
value = (value as MapperSql).Sql;
}
baseParameter.CommonTempData = value;
}
else