mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-07-15 05:13:27 +08:00
-
This commit is contained in:
parent
31164e19d1
commit
7137b5c2be
@ -48,8 +48,8 @@ namespace OrmTest.Demo
|
|||||||
|
|
||||||
conModels.Add(new ConditionalCollections() { ConditionalList=new List<KeyValuePair<WhereType, SqlSugar.ConditionalModel>>()// (id=1 or id=2 and id=1)
|
conModels.Add(new ConditionalCollections() { ConditionalList=new List<KeyValuePair<WhereType, SqlSugar.ConditionalModel>>()// (id=1 or id=2 and id=1)
|
||||||
{
|
{
|
||||||
new KeyValuePair<WhereType, ConditionalModel>( WhereType.Or ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }),
|
new KeyValuePair<WhereType, ConditionalModel>( WhereType.And ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }),
|
||||||
new KeyValuePair<WhereType, ConditionalModel> (WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" }),
|
new KeyValuePair<WhereType, ConditionalModel> (WhereType.Or,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" }),
|
||||||
new KeyValuePair<WhereType, ConditionalModel> ( WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" })
|
new KeyValuePair<WhereType, ConditionalModel> ( WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" })
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -396,11 +396,15 @@ namespace SqlSugar
|
|||||||
var isLast = index == (item.ConditionalList.Count - 1);
|
var isLast = index == (item.ConditionalList.Count - 1);
|
||||||
if (isFirst)
|
if (isFirst)
|
||||||
{
|
{
|
||||||
builder.Append(" AND( ");
|
builder.AppendFormat(" {0} ( ", con.Key.ToString().ToUpper());
|
||||||
}
|
}
|
||||||
List<IConditionalModel> conModels = new List<IConditionalModel>();
|
List<IConditionalModel> conModels = new List<IConditionalModel>();
|
||||||
conModels.Add(con.Value);
|
conModels.Add(con.Value);
|
||||||
var childSqlInfo = ConditionalModelToSql(conModels,1000*(1+index));
|
var childSqlInfo = ConditionalModelToSql(conModels,1000*(1+index));
|
||||||
|
if (!isFirst) {
|
||||||
|
|
||||||
|
builder.AppendFormat(" {0} ", con.Key.ToString().ToUpper());
|
||||||
|
}
|
||||||
builder.Append(childSqlInfo.Key);
|
builder.Append(childSqlInfo.Key);
|
||||||
parameters.AddRange(childSqlInfo.Value);
|
parameters.AddRange(childSqlInfo.Value);
|
||||||
if (isLast)
|
if (isLast)
|
||||||
@ -409,7 +413,6 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
builder.AppendFormat(" {0} ", con.Key.ToString().ToUpper());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user