Merge remote-tracking branch 'origin/online1' into online1

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>
 	<!-- 分页查询 -->