mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-05-06 05:37:58 +08:00
Update core
This commit is contained in:
parent
be1b8c6d99
commit
988e463fbe
@ -427,7 +427,10 @@ namespace SqlSugar
|
|||||||
|
|
||||||
public virtual string ToCountSql(string sql)
|
public virtual string ToCountSql(string sql)
|
||||||
{
|
{
|
||||||
|
if (sql != null && sql.Contains("-- No table"))
|
||||||
|
{
|
||||||
|
return "-- No table";
|
||||||
|
}
|
||||||
return string.Format(" SELECT COUNT(1) FROM ({0}) CountTable ", sql);
|
return string.Format(" SELECT COUNT(1) FROM ({0}) CountTable ", sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +71,14 @@ namespace SqlSugar
|
|||||||
string result = null;
|
string result = null;
|
||||||
sql = new StringBuilder();
|
sql = new StringBuilder();
|
||||||
sql.AppendFormat(SqlTemplate, "Count(*)", GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString);
|
sql.AppendFormat(SqlTemplate, "Count(*)", GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, (Skip != null || Take != null) ? null : GetOrderByString);
|
||||||
if (IsCount) { return sql.ToString(); }
|
if (IsCount)
|
||||||
|
{
|
||||||
|
if (sql.ToString().Contains("-- No table"))
|
||||||
|
{
|
||||||
|
return "-- No table";
|
||||||
|
}
|
||||||
|
return sql.ToString();
|
||||||
|
}
|
||||||
if (Skip != null && Take == null)
|
if (Skip != null && Take == null)
|
||||||
{
|
{
|
||||||
if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
|
if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0];
|
||||||
|
Loading…
Reference in New Issue
Block a user