diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs index 3e5a80d47..b43fb1fe6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs @@ -85,15 +85,17 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach if (pagination != null) { - var l1 = this.BaseRepository().FindList(strSql.ToString(), pagination); - var rec = pagination.records; + //var l1 = this.BaseRepository().FindList(strSql.ToString(), pagination); + //var rec = pagination.records; - var l2 = this.BaseRepository().FindList(strSql_Elective.ToString(), pagination); + //var l2 = this.BaseRepository().FindList(strSql_Elective.ToString(), pagination); - if (rec > pagination.records) - pagination.records = rec; + //if (rec > pagination.records) + // pagination.records = rec; - return this.BaseRepository().FindList(strSql.ToString(), pagination).Union(this.BaseRepository().FindList(strSql_Elective.ToString(), pagination)); + var sql = $"{strSql.ToString()} union {strSql_Elective.ToString()}"; + //return this.BaseRepository().FindList(strSql.ToString(), pagination).Union(this.BaseRepository().FindList(strSql_Elective.ToString(), pagination)); + return this.BaseRepository().FindList(sql, pagination); } else return BaseRepository().FindList(strSql.ToString()).Union(BaseRepository().FindList(strSql_Elective.ToString()));