mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-23 04:23:47 +08:00
Synchronization code
This commit is contained in:
@@ -665,6 +665,15 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
if (conditionalModels.IsNullOrEmpty()) return this;
|
if (conditionalModels.IsNullOrEmpty()) return this;
|
||||||
var sqlObj = this.SqlBuilder.ConditionalModelToSql(conditionalModels,0);
|
var sqlObj = this.SqlBuilder.ConditionalModelToSql(conditionalModels,0);
|
||||||
|
if (sqlObj.Value != null && this.QueryBuilder.Parameters != null)
|
||||||
|
{
|
||||||
|
if (sqlObj.Value.Any(it => this.QueryBuilder.Parameters.Any(z => z.ParameterName.EqualCase(it.ParameterName))))
|
||||||
|
{
|
||||||
|
var sql = sqlObj.Key;
|
||||||
|
this.SqlBuilder.RepairReplicationParameters(ref sql,sqlObj.Value,this.QueryBuilder.Parameters.Count*10);
|
||||||
|
return this.Where(sql, sqlObj.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
return this.Where(sqlObj.Key, sqlObj.Value);
|
return this.Where(sqlObj.Key, sqlObj.Value);
|
||||||
}
|
}
|
||||||
public ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels, bool isWrap)
|
public ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels, bool isWrap)
|
||||||
|
@@ -211,6 +211,10 @@ namespace SqlSugar
|
|||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
result = row[name].ObjToString() == it[name].ObjToString();
|
result = row[name].ObjToString() == it[name].ObjToString();
|
||||||
|
if (result==false&&it[name] != null && it[name].GetType() == UtilConstants.DecType)
|
||||||
|
{
|
||||||
|
result= row[name].ObjToDecimal() == it[name].ObjToDecimal();
|
||||||
|
}
|
||||||
if (result == false)
|
if (result == false)
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user