mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-23 04:23:47 +08:00
Synchronization code
This commit is contained in:
@@ -529,10 +529,13 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
//var x=method.Arguments[1];
|
//var x=method.Arguments[1];
|
||||||
var conditionals = ExpressionTool.GetExpressionValue(method.Arguments[1]) as List<IConditionalModel>;
|
var conditionals = ExpressionTool.GetExpressionValue(method.Arguments[1]) as List<IConditionalModel>;
|
||||||
var whereObj = queryable.QueryBuilder.Builder.ConditionalModelToSql(conditionals);
|
if (conditionals.Count > 0)
|
||||||
where.Add(whereObj.Key);
|
{
|
||||||
if(whereObj.Value!=null)
|
var whereObj = queryable.QueryBuilder.Builder.ConditionalModelToSql(conditionals);
|
||||||
result.Parameters.AddRange(whereObj.Value);
|
where.Add(whereObj.Key);
|
||||||
|
if(whereObj.Value!=null)
|
||||||
|
result.Parameters.AddRange(whereObj.Value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -2621,9 +2621,23 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
else if ((expression as LambdaExpression).Body is NewExpression)
|
else if ((expression as LambdaExpression).Body is NewExpression)
|
||||||
{
|
{
|
||||||
var lamResult = QueryBuilder.GetExpressionValue(expression, isSingle ? ResolveExpressType.ArraySingle : ResolveExpressType.ArrayMultiple);
|
var newExp = (expression as LambdaExpression).Body as NewExpression;
|
||||||
var items = lamResult.GetResultString().Split(',').Where(it => it.HasValue()).Select(it => it + UtilConstants.Space + type.ToString().ToUpper()).ToList();
|
var result = "";
|
||||||
OrderBy(string.Join(",", items));
|
foreach (var item in newExp.Arguments)
|
||||||
|
{
|
||||||
|
if (item is MemberExpression)
|
||||||
|
{
|
||||||
|
result +=
|
||||||
|
QueryBuilder.GetExpressionValue(item, isSingle ? ResolveExpressType.FieldSingle : ResolveExpressType.FieldMultiple).GetResultString() + ",";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result +=
|
||||||
|
QueryBuilder.GetExpressionValue(item, isSingle ? ResolveExpressType.WhereSingle : ResolveExpressType.WhereMultiple).GetResultString() + ",";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result = result.TrimEnd(',');
|
||||||
|
OrderBy(result);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user