From c8ba2fdc62c1cb7bf98124ee40598fb4453b3fea Mon Sep 17 00:00:00 2001 From: "610262374@qq.com" <610262374@qq.com> Date: Mon, 24 Dec 2018 16:34:32 +0800 Subject: [PATCH] MergeTable BUG --- .../SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index f24a6c1f3..4cd1558bd 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -484,7 +484,7 @@ namespace SqlSugar } public virtual ISugarQueryable MergeTable() { - Check.Exception(this.MapperAction != null, "'Mapper’ needs to be written after ‘MergeTable’ "); + Check.Exception(this.MapperAction != null||this.MapperActionWithCache!=null, "'Mapper’ needs to be written after ‘MergeTable’ "); Check.Exception(this.QueryBuilder.SelectValue.IsNullOrEmpty(), "MergeTable need to use Queryable.Select Method ."); Check.Exception(this.QueryBuilder.Skip > 0 || this.QueryBuilder.Take > 0 || this.QueryBuilder.OrderByValue.HasValue(), "MergeTable Queryable cannot Take Skip OrderBy PageToList "); ToSqlBefore();