Merge pull request 'staging' (#12) from staging into master

Reviewed-on: #12

Dolphin.ExamPictureCut.Application/Exams/ExamManager.cs

@@ -413,11 +413,19 @@ dotPenOriginalImg:
                 await DbBiz.BeginTranAsync();
 
                 // 删除
-                await DbBiz.Deleteable<MkExamResult>().Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial).ExecuteCommandAsync();
+                var delObjectiveIds = await DbBiz.Queryable<MkExamResult>()
+                    .Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentNo == penSerial)
+                    .Select(s => s.Id).ToListAsync();
+                await DbBiz.Deleteable<MkExamResult>().Where(w => delObjectiveIds.Contains(w.Id)).ExecuteCommandAsync();
+
+                var delSubjectiveIds = await DbBiz.Queryable<SubjectiveMarkingResult>()
+                    .Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false)
+                    .Select(s => s.Id).ToListAsync();
                 await DbBiz.Updateable<SubjectiveMarkingResult>()
                     .SetColumns(s => new SubjectiveMarkingResult { IsDeleted = true, UpdateDate = Clock.Now })
-                    .Where(w => w.ExamSubjectId == eto.ExamSubjectId && w.StudentExamNum == penSerial && w.IsDeleted == false)
+                    .Where(w => delSubjectiveIds.Contains(w.Id))
                     .ExecuteCommandAsync();
+
                 // 新增
                 await DbBiz.Insertable(kgtDtls).ExecuteCommandAsync();
                 await DbBiz.Insertable(zgtDtls).ExecuteCommandAsync();

Dolphin.ExamPictureCut.HttpApi.Host/DolphinExamPictureCutHttpApiHostModule.cs

@@ -63,7 +63,7 @@ public class DolphinExamPictureCutHttpApiHostModule : AbpModule
                 },
                 db =>
                 {
-                    db.QueryFilter.AddTableFilter<ISoftDelete>(s => s.IsDeleted == false);
+                    //db.QueryFilter.AddTableFilter<ISoftDelete>(s => s.IsDeleted == false);
 
                     var config = new SqlSugarConfig();
                     db.Aop.DataExecuting = config.DataExecuting(context.Services);