mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-07-15 14:04:44 +08:00
Update .net core project
This commit is contained in:
parent
c67c6dca03
commit
7e8c0576d3
@ -2495,7 +2495,7 @@ namespace SqlSugar
|
|||||||
if (this.QueryBuilder.AsTables != null && this.QueryBuilder.AsTables.Count==1)
|
if (this.QueryBuilder.AsTables != null && this.QueryBuilder.AsTables.Count==1)
|
||||||
{
|
{
|
||||||
var tableinfo = this.QueryBuilder.AsTables.First();
|
var tableinfo = this.QueryBuilder.AsTables.First();
|
||||||
if (this.Context.CurrentConnectionConfig?.MoreSettings?.IsWithNoLockQuery == true&& this.QueryBuilder.AsTables.First().Value.ObjToString().Contains(SqlWith.NoLock) ==false)
|
if (this.QueryBuilder.TableWithString!=SqlWith.Null&&this.Context.CurrentConnectionConfig?.MoreSettings?.IsWithNoLockQuery == true&& this.QueryBuilder.AsTables.First().Value.ObjToString().Contains(SqlWith.NoLock) ==false)
|
||||||
{
|
{
|
||||||
this.QueryBuilder.AsTables[tableinfo.Key] = " (SELECT * FROM " + this.QueryBuilder.AsTables.First().Value + $" {SqlWith.NoLock} )";
|
this.QueryBuilder.AsTables[tableinfo.Key] = " (SELECT * FROM " + this.QueryBuilder.AsTables.First().Value + $" {SqlWith.NoLock} )";
|
||||||
}
|
}
|
||||||
|
@ -150,8 +150,15 @@ namespace SqlSugar
|
|||||||
{
|
{
|
||||||
var parameter = model.Args[0];
|
var parameter = model.Args[0];
|
||||||
var parameter1 = model.Args[1];
|
var parameter1 = model.Args[1];
|
||||||
|
if (parameter1.MemberValue is bool)
|
||||||
|
{
|
||||||
|
return string.Format("IFNULL(CAST({0} as SIGNED),{1})", parameter.MemberName, parameter1.MemberName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
return string.Format("IFNULL({0},{1})", parameter.MemberName, parameter1.MemberName);
|
return string.Format("IFNULL({0},{1})", parameter.MemberName, parameter1.MemberName);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public override string GetDate()
|
public override string GetDate()
|
||||||
{
|
{
|
||||||
return "NOW()";
|
return "NOW()";
|
||||||
|
Loading…
Reference in New Issue
Block a user