Merge branch 'master' of gitee.com:sunkaixuan/sqlsugar_orm_4-0

This commit is contained in:
sunkaixuan 2018-12-27 18:00:20 +08:00
commit 91c20416f9

View File

@ -484,7 +484,7 @@ namespace SqlSugar
}
public virtual ISugarQueryable<T> 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();