update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamCertificationServiceImpl.java

@@ -87,7 +87,10 @@ public class ExamCertificationServiceImpl extends BaseServiceImpl<Long, ExamCert
 		needCheckingDetailDto.setWaitNum(waitNum);
 		needCheckingDetailDto.setDesc(sysConfigService.findConfigValue("exam_room_desc",needCheckingDetailDto.getTenantId()));
 		ExamRegistration examRegistration = examRegistrationDao.get(examRegistrationId);
-		needCheckingDetailDto.setSubjectName(subjectDao.get(examRegistration.getSubjectId()).getName());
+		Subject subject = subjectDao.get(examRegistration.getSubjectId());
+		if(subject != null){
+			needCheckingDetailDto.setSubjectName(subject.getName());
+		}
 		needCheckingDetailDto.setLevel(examRegistration.getLevel());
 		if(needCheckingDetailDto.getFinishedExam() == 4 && needCheckingDetailDto.getRecordStartTime() != null){
 			int recordMinutes = Integer.parseInt(sysConfigService.findConfigValue("record_minutes",needCheckingDetailDto.getTenantId()));

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -475,12 +475,11 @@
 		SELECT COUNT(er.id_)
 		FROM exam_registration er
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
-		LEFT JOIN exam_subject_song ess ON er.examination_basic_id_ = ess.examination_basic_id_
+		LEFT JOIN exam_subject_song ess ON er.examination_basic_id_ = ess.examination_basic_id_ AND er.subject_id_ = ess.exam_subject_id_ AND er.level_ = ess.level_
 		<include refid="queryStudentListSql"/>
 	</select>
 	<sql id="queryStudentListSql">
 		<where>
-			er.subject_id_ = ess.exam_subject_id_ AND er.level_ = ess.level_
 			<if test="studentId != null">
 				AND er.student_id_ = #{studentId}
 			</if>
@@ -502,7 +501,7 @@
 		eb.expect_exam_start_time_,eb.name_ examBaseName,ess.practice_song_id_list_,ess.perform_song_id_list_
 		FROM exam_registration er
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
-		LEFT JOIN exam_subject_song ess ON er.examination_basic_id_ = ess.examination_basic_id_
+		LEFT JOIN exam_subject_song ess ON er.examination_basic_id_ = ess.examination_basic_id_ AND er.subject_id_ = ess.exam_subject_id_ AND er.level_ = ess.level_
 		<include refid="queryStudentListSql"/>
 		ORDER BY er.update_time_ DESC
 		<include refid="global.limit"/>