Merge remote-tracking branch 'origin/master'

school-paper/src/main/resources/mapper/school-paper/DbErrorListMapper.xml

@@ -62,9 +62,9 @@
         dqbtp.species AS species
         dqbtp.species AS species
         FROM
         FROM
         db_error_list AS del
         db_error_list AS del
+        LEFT JOIN db_question_bank_test_paper AS dqbtp ON dqbtp.id = del.question_bank_id
         LEFT JOIN db_test_paper_record AS dtpr ON dtpr.id =  del.record_id
         LEFT JOIN db_test_paper_record AS dtpr ON dtpr.id =  del.record_id
-        LEFT JOIN db_test_paper_record_detail AS dtprd ON dtprd.record_id = dtpr.id
-        LEFT JOIN db_question_bank_test_paper AS dqbtp ON dqbtp.id = dtprd.question_bank_id
+        LEFT JOIN db_test_paper_record_detail AS dtprd ON dtprd.record_id = dtpr.id and dtprd.question_bank_id = del.question_bank_id
         <where>
         <where>
         del.user_id = #{request.userId}
         del.user_id = #{request.userId}
         <if test="request.categoryId != null">
         <if test="request.categoryId != null">