lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-08 18:34:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Filter

Browse Source
This commit is contained in:
skx
2021-01-30 17:20:43 +08:00
parent 5f42b14493
commit d53d61a5c1
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs
View File

@@ -340,7 +340,10 @@ namespace SqlSugar
} }
if (isSingle) if (isSingle)
{ {
if (ChildType != this.EntityType)
{
return;
}
} }
else if (isMain) else if (isMain)
{ {
@@ -352,6 +355,10 @@ namespace SqlSugar
var easyInfo = EasyJoinInfos.FirstOrDefault(it => var easyInfo = EasyJoinInfos.FirstOrDefault(it =>
it.Value.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) || it.Value.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) ||
it.Value.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)); it.Value.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
if (easyInfo.Key==null)
{
return;
}
var shortName = this.Builder.GetTranslationColumnName(easyInfo.Key.Trim()) + "."; var shortName = this.Builder.GetTranslationColumnName(easyInfo.Key.Trim()) + ".";
sql = sql.Replace(itName, shortName); sql = sql.Replace(itName, shortName);
} }
@@ -360,6 +367,10 @@ namespace SqlSugar
var easyInfo = JoinQueryInfos.FirstOrDefault(it => var easyInfo = JoinQueryInfos.FirstOrDefault(it =>
it.TableName.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) || it.TableName.Equals(entityInfo.DbTableName, StringComparison.CurrentCultureIgnoreCase) ||
it.TableName.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase)); it.TableName.Equals(entityInfo.EntityName, StringComparison.CurrentCultureIgnoreCase));
if (easyInfo == null)
{
return;
}
var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName.Trim()) + "."; var shortName = this.Builder.GetTranslationColumnName(easyInfo.ShortName.Trim()) + ".";
sql = sql.Replace(itName, shortName); sql = sql.Replace(itName, shortName);
} }