From 7ab88068ac2ed4d6e3bc59157904965ebd11910d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 08 七月 2024 09:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/ExamPaperScoreMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ExamPaperScoreMapper.xml b/src/main/resources/mapper/ExamPaperScoreMapper.xml
index 0c24845..6d32871 100644
--- a/src/main/resources/mapper/ExamPaperScoreMapper.xml
+++ b/src/main/resources/mapper/ExamPaperScoreMapper.xml
@@ -127,8 +127,8 @@
INNER JOIN t_exam t ON a.id = t.exam_paper_id AND t.deleted = 0
LEFT JOIN t_subject b ON a.subject_id = b.id AND b.deleted = 0
LEFT JOIN t_user c ON t.teacher_id = c.id AND c.deleted = 0
- LEFT JOIN t_exam_paper_score d ON t.id = d.exam_id
- LEFT JOIN t_classes_user e ON t.classes_id = e.classes_id
+ LEFT JOIN t_exam_paper_score d ON t.id = d.exam_id AND d.deleted = 0
+ LEFT JOIN t_classes_user e ON t.classes_id = e.classes_id AND e.deleted = 0
<where>
a.deleted = 0
<if test="subjectId != null and subjectId.size() > 0">
--
Gitblit v1.8.0