mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-05-08 22:58:03 +08:00
Synchronization code
This commit is contained in:
parent
1be19a1a4d
commit
c2040289f3
@ -256,9 +256,17 @@ namespace SqlSugar
|
|||||||
if (sql.SelectString == null)
|
if (sql.SelectString == null)
|
||||||
{
|
{
|
||||||
var columns = bEntityInfo.Columns.Where(it => !it.IsIgnore)
|
var columns = bEntityInfo.Columns.Where(it => !it.IsIgnore)
|
||||||
.Select(it => GetOneToManySelectByColumnInfo(it,abDb)).ToList();
|
.Select(it => GetOneToManySelectByColumnInfo(it, abDb)).ToList();
|
||||||
sql.SelectString = String.Join(",", columns);
|
sql.SelectString = String.Join(",", columns);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var bid=InstanceFactory.GetQueryBuilderWithContext(abDb).Builder.GetTranslationColumnName(bPkColumn.DbColumnName);
|
||||||
|
if (!sql.SelectString.ToLower().Contains(bid?.ToLower())&&!sql.SelectString.Contains("*"))
|
||||||
|
{
|
||||||
|
sql.SelectString += ("," + bid+" AS " +bid);
|
||||||
|
}
|
||||||
|
}
|
||||||
var bList = selector(bDb.Queryable<object>().AS(bEntityInfo.DbTableName).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : bEntityInfo.Type).AddParameters(sql.Parameters).Where(conditionalModels2).WhereIF(sql.WhereString.HasValue(),sql.WhereString).Select(sql.SelectString).OrderByIF(sql.OrderByString.HasValue(),sql.OrderByString));
|
var bList = selector(bDb.Queryable<object>().AS(bEntityInfo.DbTableName).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : bEntityInfo.Type).AddParameters(sql.Parameters).Where(conditionalModels2).WhereIF(sql.WhereString.HasValue(),sql.WhereString).Select(sql.SelectString).OrderByIF(sql.OrderByString.HasValue(),sql.OrderByString));
|
||||||
if (bList.HasValue())
|
if (bList.HasValue())
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user