Merge branch 'master' into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -450,7 +450,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			}
 			List<Subject> subjects = new ArrayList<>();
 			if(!CollectionUtils.isEmpty(subjectIds)){
-				subjectDao.findBySubjectIds(new ArrayList<>(subjectIds));
+				subjects = subjectDao.findBySubjectIds(new ArrayList<>(subjectIds));
 			}
 			for (TeacherServeExtraDto teacherServeExtraDto : dataList) {
 				if(idNameMap.containsKey(teacherServeExtraDto.getUserId())){

mec-biz/src/main/resources/config/mybatis/SysExamSongMapper.xml

@@ -98,6 +98,9 @@
 					AND ses.create_user_id_ = #{createUserId}
 				</if>
 			</if>
+			<if test="subjectId != null">
+				AND FIND_IN_SET(#{subjectId},ses.subject_ids_)
+			</if>
 		</where>
 	</sql>
 	<!-- 分页查询 -->