upadte

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamReviewServiceImpl.java

@@ -114,7 +114,7 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
 		examReview.setTeacherId(sysUser.getId());
 		examReview.setStudentId(examRoomStudentRelation.getStudentId());
 		examReview.setExamRoomId(examRoomStudentRelation.getExamRoomId());
-		examReview.setTeacherId(Integer.parseInt(examRoomStudentRelation.getTenantId()));
+		examReview.setStudentId(Integer.parseInt(examRoomStudentRelation.getTenantId()));
 		examReviewDao.insert(examReview);
 	}
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -181,7 +181,7 @@
 		SELECT COUNT(DISTINCT ser.id_)
 		FROM exam_room_student_relation ersr
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_
-		LEFT JOIN exam_review er ON ser.exam_registration_id_ = er.exam_registration_id_
+		LEFT JOIN exam_review er ON ser.exam_registration_id_ = er.exam_registration_id_ AND er.teacher_id_ = #{teacherId}
 		<include refid="queryExamReviewRecordListSql"/>
 	</select>
 	<resultMap id="ExamReviewRecordDtoMap" type="com.keao.edu.user.dto.ExamReviewRecordDto">
@@ -199,13 +199,10 @@
 	</resultMap>
 	<sql id="queryExamReviewRecordListSql">
 		<where>
-			<if test="reviewFlag == null">
-				AND er.teacher_id_ = #{teacherId} OR er.id_ IS NULL
+			<if test="reviewFlag != null and reviewFlag == 1">
+				AND er.id_ IS NOT NULL
 			</if>
-			<if test="reviewFlag == 1">
-				AND er.teacher_id_ = #{teacherId}
-			</if>
-			<if test="reviewFlag == 0">
+			<if test="reviewFlag != null and reviewFlag == 0">
 				AND er.id_ IS NULL
 			</if>
 			<if test="roomId != 0">
@@ -219,7 +216,7 @@
 		er.evaluation_result_,ersr.exam_registration_id_,er.id_,ersr.student_id_,ser.video_url_
 		FROM exam_room_student_relation ersr
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_
-		LEFT JOIN exam_review er ON ser.exam_registration_id_ = er.exam_registration_id_
+		LEFT JOIN exam_review er ON ser.exam_registration_id_ = er.exam_registration_id_ AND er.teacher_id_ = #{teacherId}
 		<include refid="queryExamReviewRecordListSql"/>
 		ORDER BY ser.is_finished_exam_ DESC
 		<include refid="global.limit"/>