Merge branch 'feature/exam' into test

合并冲突

src/Hotline.Application/Exam/Service/ExamManages/UserExamService.cs

@@ -719,7 +719,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
         public async Task<GradingResultPageViewResponse> GetGradingResultPagedList(GradingPagedRequest gradingPagedRequest)
         {
             // 只要有阅卷记录就在已阅卷列表中，已阅卷和未阅卷会有重复数据，只有所有记录都已阅卷才会从未阅卷列表中排除
-            var userExamTable = _repository.Queryable().WhereIF(gradingPagedRequest.IsCheck != null, x => x.IsCheck == gradingPagedRequest.IsCheck).Where(x=>x.IsSubmit);
+            var userExamTable = _repository.Queryable().Where(x=>x.IsSubmit);
 
             var examManageTable = new ExamRepository<ExamManage>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable();
 
@@ -741,7 +741,9 @@ namespace Hotline.Application.Exam.Service.ExamManages
                 IsCheck = SqlFunc.Subqueryable<ExamUserExam>().Where(x => x.ExamId == e.Id && !x.IsCheck).Count() <= 0,
                 Id = e.Id,
                 Remark = e.Remark
-            });
+            }).MergeTable();
+
+            queryable = queryable.WhereIF(gradingPagedRequest.IsCheck != null, x => x.IsCheck == gradingPagedRequest.IsCheck);
 
             var list = await queryable.ToPageListAsync(gradingPagedRequest.PageIndex, gradingPagedRequest.PageSize);
             var total = await queryable.CountAsync();