mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-05-05 05:07:57 +08:00
Synchronization code
This commit is contained in:
parent
f5bf8b7888
commit
e64ead6288
@ -1386,30 +1386,30 @@ namespace SqlSugar
|
|||||||
protected string AppendSelect<EntityType>(string sql, ReadOnlyCollection<ParameterExpression> parameters, List<EntityColumnInfo> columnsResult, int parameterIndex1)
|
protected string AppendSelect<EntityType>(string sql, ReadOnlyCollection<ParameterExpression> parameters, List<EntityColumnInfo> columnsResult, int parameterIndex1)
|
||||||
{
|
{
|
||||||
var columns = this.Context.EntityMaintenance.GetEntityInfoWithAttr(typeof(EntityType)).Columns;
|
var columns = this.Context.EntityMaintenance.GetEntityInfoWithAttr(typeof(EntityType)).Columns;
|
||||||
var lowerSql = sql.ToLower();
|
//var lowerSql = sql.ToLower();
|
||||||
var isSubquery = lowerSql.Contains("select ") && ExpressionTool.IsMemberInit(this.QueryBuilder.SelectValue);
|
//var isSubquery = lowerSql.Contains("select ") && ExpressionTool.IsMemberInit(this.QueryBuilder.SelectValue);
|
||||||
if (isSubquery)
|
//if (isSubquery)
|
||||||
{
|
//{
|
||||||
return AppendSelectWithSubQuery(columns, sql, parameters, columnsResult, parameterIndex1, parameters[parameterIndex1].Name);
|
return AppendSelectWithSubQuery(columns, sql, parameters, columnsResult, parameterIndex1, parameters[parameterIndex1].Name);
|
||||||
}
|
//}
|
||||||
var parameterName = parameters[parameterIndex1].Name;
|
//var parameterName = parameters[parameterIndex1].Name;
|
||||||
if (parameterName.HasValue())
|
//if (parameterName.HasValue())
|
||||||
{
|
//{
|
||||||
parameterName = this.SqlBuilder.GetTranslationColumnName(parameterName);
|
// parameterName = this.SqlBuilder.GetTranslationColumnName(parameterName);
|
||||||
}
|
//}
|
||||||
foreach (var item in columns)
|
//foreach (var item in columns)
|
||||||
{
|
//{
|
||||||
if (item.IsIgnore == false && columnsResult.Any(it => it.PropertyName.EqualCase(item.PropertyName)) && !sql.ToLower().Contains(SqlBuilder.GetTranslationColumnName(item.PropertyName).ToLower()))
|
// if (item.IsIgnore == false && columnsResult.Any(it => it.PropertyName.EqualCase(item.PropertyName)) && !sql.ToLower().Contains(SqlBuilder.GetTranslationColumnName(item.PropertyName).ToLower()))
|
||||||
{
|
// {
|
||||||
if (!sql.Contains($"{parameterName}.{SqlBuilder.GetTranslationColumnName(item.DbColumnName)} AS {SqlBuilder.GetTranslationColumnName(item.PropertyName)}")&&
|
// if (!sql.Contains($"{parameterName}.{SqlBuilder.GetTranslationColumnName(item.DbColumnName)} AS {SqlBuilder.GetTranslationColumnName(item.PropertyName)}")&&
|
||||||
!sql.Contains($"{parameterName}.{SqlBuilder.GetTranslationColumnName(item.DbColumnName)} AS {SqlBuilder.GetTranslationColumnName(item.PropertyName)}"))
|
// !sql.Contains($"{parameterName}.{SqlBuilder.GetTranslationColumnName(item.DbColumnName)} AS {SqlBuilder.GetTranslationColumnName(item.PropertyName)}"))
|
||||||
{
|
// {
|
||||||
sql = $" {sql},{parameterName}.{SqlBuilder.GetTranslationColumnName(item.DbColumnName)} AS {SqlBuilder.GetTranslationColumnName(item.PropertyName)} ";
|
// sql = $" {sql},{parameterName}.{SqlBuilder.GetTranslationColumnName(item.DbColumnName)} AS {SqlBuilder.GetTranslationColumnName(item.PropertyName)} ";
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
||||||
return sql;
|
//return sql;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal JoinQueryInfo GetJoinInfo(Expression joinExpression, JoinType joinType)
|
internal JoinQueryInfo GetJoinInfo(Expression joinExpression, JoinType joinType)
|
||||||
|
Loading…
Reference in New Issue
Block a user