查询

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

@@ -116,12 +116,15 @@
         from tenant_album_music t
         left join music_sheet m on t.music_sheet_id_ = m.id_ and find_in_set('TENANT',m.provider_type_)
         where
-        t.del_flag_ = 0 and m.tenant_del_flag_ =0 and m.tenant_state_ =1
+         t.del_flag_ = 0
         <if test="param.tenantAlbumId != null">
-            and t.tenant_album_id_ = #{param.tenantAlbumId}
+             and t.tenant_album_id_ = #{param.tenantAlbumId}
         </if>
         <if test="param.subjectType != null">
             and t.subject_type_ = #{param.subjectType}
+            <if test="param.subjectType.code != 'COURSEWARE'">
+               and m.tenant_del_flag_ =0 and m.tenant_state_ =1
+            </if>
         </if>
         <if test="albumIds != null and albumIds.size() != 0">
             and t.tenant_album_id_ in
@@ -131,7 +134,7 @@
         </if>
         <if test="param.subjectId != null">
             and ( find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = ''
-            or t.subject_type_ not in  ('ENSEMBLE', 'MUSIC', 'SUBJECT') OR m.is_all_subject_)
+            or t.subject_type_ in  ('COURSEWARE') OR m.is_all_subject_)
         </if>
     </select>