update

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamSubjectSongDao.java

@@ -42,6 +42,6 @@ public interface ExamSubjectSongDao extends BaseDAO<Long, ExamSubjectSong> {
     List<ExamSubjectSongDto> queryExamSubjectSongs(Map<String, Object> params);
     int countExamSubjectSongs(Map<String, Object> params);
 
-    int countExamSongsWithSubject(@Param("subjectId") Integer subjectId);
+    int countExamSongsWithSubject(@Param("examId") Long examId,@Param("subjectId") Integer subjectId);
 
 }

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

@@ -193,7 +193,7 @@ public class ExamSubjectSongServiceImpl extends BaseServiceImpl<Long, ExamSubjec
 			&&!ExamStatusEnum.NOT_START.equals(examinationBasic.getStatus())){
 			throw new BizException("此状态无法删除");
 		}
-		int i = examSubjectSongDao.countExamSongsWithSubject(examSubjectSong.getExamSubjectId().intValue());
+		int i = examSubjectSongDao.countExamSongsWithSubject(examSubjectSong.getExaminationBasicId().longValue(),examSubjectSong.getExamSubjectId().intValue());
 		examSubjectSongDao.delete(id);
 		if(i<=1){
 			examSubjectDao.deleteWithExamSubject(examSubjectSong.getExaminationBasicId().longValue(), examSubjectSong.getExamSubjectId().intValue());

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

@@ -163,6 +163,6 @@
 		SELECT * FROM exam_subject_song WHERE examination_basic_id_=#{examinationBasicId} AND exam_subject_id_ = #{examSubjectId} ORDER BY level_ ASC
 	</select>
     <select id="countExamSongsWithSubject" resultType="int">
-		SELECT COUNT(id_) FROM exam_subject_song WHERE exam_subject_id_=#{subjectId}
+		SELECT COUNT(id_) FROM exam_subject_song WHERE examination_basic_id_=#{examId} AND exam_subject_id_=#{subjectId}
     </select>
 </mapper>