lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-04-04 23:39:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

The GroupBy and Select values are the same, and the parameter names are different. As a result, grouping fails

Browse Source
This commit is contained in:
sunkaixuan 2025-03-29 14:25:25 +08:00
parent ea38dd8413
commit b07668d308
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@ -965,6 +965,11 @@ namespace SqlSugar
{
result = "*";
}
if (result.StartsWith(UtilConstants.GroupReplaceKey))
{
this.GroupByIsReplace = true;
result = result.Replace(UtilConstants.GroupReplaceKey, string.Empty);
}
return result;
}

25
Src/Asp.NetCore2/SqlSugar/Json2Sql/Queryable/QueryableProvider.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace SqlSugar
@ -47,13 +48,33 @@ namespace SqlSugar
return this;
}
var orderObj = this.SqlBuilder.GroupByModelToSql(models);
this.GroupBy(orderObj.Key);
this.QueryBuilder.Parameters.AddRange(orderObj.Value);
if (orderObj.Value?.Length > 0 && this.Context.CurrentConnectionConfig?.DbType == DbType.SqlServer)
{
var groupBySql = UtilMethods.GetSqlString(DbType.SqlServer, orderObj.Key, orderObj.Value);
this.QueryBuilder.GroupBySql = groupBySql;
this.QueryBuilder.GroupBySqlOld = orderObj.Key;
this.QueryBuilder.GroupParameters = orderObj.Value.ToList();
this.GroupBy(orderObj.Key);
}
else
{
this.GroupBy(orderObj.Key);
this.QueryBuilder.Parameters.AddRange(orderObj.Value);
}
return this;
}
public ISugarQueryable<T> Select(List<SelectModel> models)
{
var orderObj = this.SqlBuilder.SelectModelToSql(models);
if (this.QueryBuilder.GroupParameters?.Any() == true && this.QueryBuilder.GroupBySql.HasValue())
{
var selectSql = UtilMethods.GetSqlString(DbType.SqlServer, orderObj.Key, UtilMethods.CopySugarParameters(orderObj.Value.ToList()).ToArray());
if (selectSql.Contains(this.QueryBuilder.GroupBySql))
{
this.Select(UtilConstants.GroupReplaceKey+selectSql);
return this;
}
}
this.Select(orderObj.Key);
this.QueryBuilder.Parameters.AddRange(orderObj.Value);
return this;

1
Src/Asp.NetCore2/SqlSugar/Utilities/UtilConstants.cs
View File

@ -15,6 +15,7 @@ namespace SqlSugar
internal const string AssemblyName = "SqlSugar";
internal static string ReplaceKey = "{"+Guid.NewGuid()+"}";
internal const string ReplaceCommaKey = "{112A689B-17A1-4A06-9D27-A39EAB8BC3D5}";
internal const string GroupReplaceKey = "{GroupReplaceKey_l33asdysaas1231s}";
internal static Type UShortType = typeof(ushort);
internal static Type ULongType = typeof(ulong);