diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 7c578d414..8d76d85bf 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -543,6 +543,10 @@ namespace SqlSugar { return "*"; } + if (result.Contains("/**/*")) + { + return result.Replace("/**/*", ""); + } if (result.Contains(".*") && this.IsSingle()) { return "*"; diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/DbMethods/SqlFuncExtendsion.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/DbMethods/SqlFuncExtendsion.cs index e9e9bc18e..ab35c49bf 100644 --- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/DbMethods/SqlFuncExtendsion.cs +++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/DbMethods/SqlFuncExtendsion.cs @@ -23,5 +23,9 @@ namespace SqlSugar { throw new NotSupportedException("Can only be used in expressions"); } + public static FieldType SelectAll(this FieldType field,string singleTableQueryShortName) + { + throw new NotSupportedException("Can only be used in expressions"); + } } } \ No newline at end of file diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index ada666092..d2780ad16 100644 --- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -322,7 +322,13 @@ namespace SqlSugar if (name.IsIn("GetSelfAndAutoFill","SelectAll")) { var memberValue = (args.First() as MemberExpression).Expression.ToString(); - model.Args.Add(new MethodCallExpressionArgs() { MemberValue = memberValue, IsMember = true, MemberName = memberValue }); + var data = new MethodCallExpressionArgs() { MemberValue = memberValue, IsMember = true, MemberName = memberValue }; + model.Args.Add(data); + if (args.Count() == 2) + { + data.MemberName = (args.Last()).ToString(); + data.MemberValue = "." ; + } } else { @@ -773,7 +779,12 @@ namespace SqlSugar case "SelectAll": case "GetSelfAndAutoFill": this.Context.Parameters.RemoveAll(it => it.ParameterName == model.Args[0].MemberName.ObjToString()); - return this.Context.DbMehtods.GetSelfAndAutoFill(model.Args[0].MemberValue.ObjToString(), this.Context.IsSingle); + var result1= this.Context.DbMehtods.GetSelfAndAutoFill(model.Args[0].MemberValue.ObjToString(), this.Context.IsSingle); + if ((model.Args[0].MemberValue+"") == "."&&this.Context.IsSingle) + { + result1 =this.Context.GetTranslationTableName(model.Args[0].MemberName+"",false)+".*/**/" + result1; + } + return result1; case "GetDate": return this.Context.DbMehtods.GetDate(); case "GetRandom":