diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs index b60a80870..a02fa4ed6 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs @@ -556,12 +556,12 @@ namespace SqlSugar #endregion #region Navigate - private bool IsAppendNavColumns() + internal bool IsAppendNavColumns() { return this.QueryBuilder.Includes.HasValue() && this.QueryBuilder.AppendNavInfo == null; } - private void SetAppendNavColumns(Expression expression) + internal void SetAppendNavColumns(Expression expression) { var tResultType = expression.Type; var dic = ExpressionTool.GetNewExpressionItemList(expression); diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs index 9962c162c..eada11e4a 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs @@ -229,6 +229,10 @@ namespace SqlSugar #region Select public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression, bool isAutoFill) @@ -946,11 +950,19 @@ namespace SqlSugar public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } @@ -1531,14 +1543,26 @@ namespace SqlSugar public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } #endregion @@ -2251,18 +2275,34 @@ namespace SqlSugar public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } #endregion diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider06-10.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider06-10.cs index 5ab93268b..0f76728b3 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider06-10.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider06-10.cs @@ -263,22 +263,42 @@ namespace SqlSugar #region Select public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression, bool isAutoFill) @@ -954,26 +974,50 @@ namespace SqlSugar #region Select public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression, bool isAutoFill) @@ -1612,30 +1656,58 @@ namespace SqlSugar #region Select public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression, bool isAutoFill) @@ -2265,34 +2337,66 @@ namespace SqlSugar public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } #endregion @@ -2911,38 +3015,74 @@ namespace SqlSugar public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } public ISugarQueryable Select(Expression> expression) { + if (IsAppendNavColumns()) + { + SetAppendNavColumns(expression); + } return _Select(expression); } #endregion diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 4dfbeae15..27fad01e0 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -809,7 +809,12 @@ namespace SqlSugar if (this.AppendNavInfo?.AppendProperties?.Any() ==true) { result += ","; - result += string.Join(",",this.AppendNavInfo.AppendProperties.Select(it=>it.Value+ " AS SugarNav_" + it.Key)); + var shortName = ""; + if (this.TableShortName.HasValue()) + { + shortName = $"{Builder.GetTranslationColumnName(this.TableShortName)}."; + } + result += string.Join(",",this.AppendNavInfo.AppendProperties.Select(it=> shortName+Builder.GetTranslationColumnName(it.Value)+ " AS SugarNav_" + it.Key)); } if (result.Contains("/**/*")) {