Merge remote-tracking branch 'origin/master'

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

@@ -113,6 +113,11 @@
                 from course_schedule_student_payment cssp
                 left join student_course_homework sch on sch.student_id_ = cssp.user_id_ and
                 sch.course_schedule_id_ = cssp.course_id_
+                <where>
+                    <if test="param.studentId != null">
+                        and cssp.user_id_ = #{param.studentId}
+                    </if>
+                </where>
                 group by  cssp.course_id_) a on a.course_id_ = cs.id_
         <where>
             <if test="param.decorate != null">

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

@@ -39,7 +39,7 @@
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
         select <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
-            where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0) as musicTagNames
+            where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         , t1.num as musicSheetCount
         ,t2.num as albumFavoriteCount
         from music_album t
@@ -79,7 +79,7 @@
     <select id="selectFavoritePage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
         select <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         from music_album t
         left join album_favorite af2 on af2.album_id_ = t.id_
         <where>
@@ -140,7 +140,7 @@
     <select id="selectMusicAlbumById" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
         select <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         , t1.num as musicSheetCount
         ,t2.num as albumFavoriteCount
         from music_album t
@@ -152,7 +152,7 @@
     <select id="selectStudentPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
         select <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         ,if( t1.num>0,t1.num,0) as musicSheetCount
         ,if(t2.num >0,t2.num,0) as albumFavoriteCount
         from music_album t

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

@@ -69,7 +69,7 @@
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
-            where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+            where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
             where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
@@ -121,7 +121,7 @@
     <select id="selectAlbumDetailPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
         select distinct <include refid="Base_Column_List"/>
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
@@ -180,7 +180,7 @@
         ,su.username_ as userName
         ,su.avatar_ as userAvatar
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,s2.name_ as subjectNames
         ,s2.code_ as code
         FROM music_sheet t
@@ -246,7 +246,7 @@
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.music_subject_)  and s.del_flag_ = 0) as subjectNames
         <if test="param.studentId != null">
@@ -280,7 +280,7 @@
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         ,if(mf.id_ is not null,1,0) as favorite
@@ -303,7 +303,7 @@
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         ,if(mf.id_ is not null,1,0) as favorite
@@ -324,7 +324,7 @@
         ,su.username_ as addName
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
         ,if(mf.id_ is not null,1,0) as favorite
         from music_sheet t
@@ -355,7 +355,7 @@
         ,ms.composer_ as composer
         ,ms.music_tag_ as musicTag
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,mspr.purchase_price_ as purchasePrice
         ,mspr.order_no_ as orderNo
         ,mspr.purchase_time_ as purchaseTime
@@ -398,7 +398,7 @@
         ,ms.composer_ as composer
         ,ms.music_tag_ as musicTag
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,ms.play_speed_ as playSpeed
         ,ms.music_price_ as musicPrice
         ,ms.create_time_ as createTime
@@ -440,7 +440,7 @@
         ,ms.composer_ as composer
         ,ms.music_tag_ as musicTag
         ,(select group_concat(mt.name_) from music_tag mt
-        where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0) as musicTagNames
+        where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,ms.play_speed_ as playSpeed
         ,ms.music_price_ as musicPrice
         ,ms.create_time_ as createTime