Merge branch 'zx_online_network' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleStudentMusicSheetDao.xml

@@ -53,7 +53,9 @@
         </if>
     </update>
 
-    <select id="queryBySheetIdAndCourseId" resultMap="BaseResultMap">
+    <resultMap id="queryBySheetIdAndCourseIdMap" type="com.yonge.cooleshow.biz.dal.dto.CourseScheduleStudentMusicSheetResult" extends="BaseResultMap">
+    </resultMap>
+    <select id="queryBySheetIdAndCourseId" resultMap="queryBySheetIdAndCourseIdMap">
         SELECT cssm.*
         FROM course_schedule_student_music_sheet cssm
         <where>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -272,6 +272,7 @@
         left join album_music_relate amr on t.id_ = amr.music_sheet_id_
         left join sys_user su on t.create_by_ = su.id_
         <where>
+            t.cbs_music_sheet_id_ IS NOT NULL
             <if test="param.composer != null">
                 AND t.composer_ LIKE '%${param.composer}%'
             </if>