评教接口修改

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -685,7 +685,7 @@
             @if (ViewBag.UserType == "学生")
             {
                 <div class="lr-layout-wrap-item " id="lr_layout_item6" style="padding: 10;">
-                    <center><h3> 塔里木职业技术学院</h3></center>
+                    <center><h3> 娄底幼儿师范高等专科学校</h3></center>
                     <center>
                         <h3>
                             选修课选课流程

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs

@@ -82,9 +82,17 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
                 strSql_Elective.Append("left join Eval_Main b on a.AcademicYearNo=b.AcademicYearNo and a.Semester=b.Semester where b.Status=1 and a.StuNo='" + queryParam["StuNo"] + "' and a.StuNo not in (select StuNo from " + misdbname + ".dbo.StuInfoBasic where ChangeStatus=1) ) aa ");
                 strSql_Elective.Append("left join  (select distinct b.EmpNo, b.LessonNo, b.UID from Eval_Question a left join Eval_QuestionResult b  on a.QID=b.QID) bb on aa.EmpNo=bb.EmpNo and aa.LessonNo=bb.LessonNo and aa.StuNo=bb.UID ");
                 strSql_Elective.Append("left join " + misdbname + ".dbo.EmpInfo cc on aa.EmpNo=cc.EmpNo left join " + misdbname + ".dbo.LessonInfo dd on aa.LessonNo = dd.LessonNo ");
-
+                 
                 if (pagination != null)
                 {
+                    var l1 = this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString(), pagination);
+                    var rec = pagination.records;
+
+                    var l2 = this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql_Elective.ToString(), pagination);
+
+                    if (rec > pagination.records)
+                        pagination.records = rec;
+
                     return this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql.ToString(), pagination).Union(this.BaseRepository().FindList<Eval_QuestionResultEntity>(strSql_Elective.ToString(), pagination));
                 }
                 else