fix:注销

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

@@ -47,8 +47,16 @@
         , t1.num as musicSheetCount
         ,t2.num as albumFavoriteCount
         from music_album t
-        left join (select count(1) as num,amr.album_id_ from album_music_relate amr group by amr.album_id_) t1 on t1.album_id_ = t.id_
-        left join (select count(1) as num,af.album_id_ from album_favorite af group by af.album_id_) t2 on t2.album_id_ = t.id_
+        left join (select count(1) as num,amr.album_id_
+            from album_music_relate amr
+            join music_sheet ms on amr.music_sheet_id_ = ms.id_
+            left join sys_user su on su.id_ = ms.user_id_
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+        group by amr.album_id_) t1 on t1.album_id_ = t.id_
+        left join (select count(1) as num,af.album_id_ from album_favorite af
+            left join sys_user su on af.user_id_ = su.id_
+            where su.del_flag_ = 0 group by af.album_id_
+        ) t2 on t2.album_id_ = t.id_
         <where>
             t.del_flag_ = 0
             <if test="query.idAndName != null and query.idAndName != ''">
@@ -133,9 +141,13 @@
         left join (select count(1) as num,amr.album_id_
             from album_music_relate amr
             join music_sheet ms on amr.music_sheet_id_ = ms.id_
-            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
+            left join sys_user su on su.id_ = ms.user_id_
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
             group by amr.album_id_) t1 on t1.album_id_ = t.id_
-        left join (select count(1) as num,af.album_id_ from album_favorite af group by af.album_id_) t2 on t2.album_id_ = t.id_
+        left join (select count(1) as num,af.album_id_ from album_favorite af
+                left join sys_user su on af.user_id_ = su.id_
+                where su.del_flag_ = 0 group by af.album_id_
+        ) t2 on t2.album_id_ = t.id_
         <where>
             t.del_flag_ = 0
             <if test="records != null and records.size() != 0">
@@ -163,8 +175,16 @@
         , t1.num as musicSheetCount
         ,t2.num as albumFavoriteCount
         from music_album t
-        left join (select count(1) as num,amr.album_id_ from album_music_relate amr group by amr.album_id_) t1 on t1.album_id_ = t.id_
-        left join (select count(1) as num,af.album_id_ from album_favorite af group by af.album_id_) t2 on t2.album_id_ = t.id_
+        left join (select count(1) as num,amr.album_id_
+            from album_music_relate amr
+            join music_sheet ms on amr.music_sheet_id_ = ms.id_
+            left join sys_user su on su.id_ = ms.user_id_
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+            group by amr.album_id_) t1 on t1.album_id_ = t.id_
+        left join (select count(1) as num,af.album_id_ from album_favorite af
+            left join sys_user su on af.user_id_ = su.id_
+            where su.del_flag_ = 0 group by af.album_id_
+        ) t2 on t2.album_id_ = t.id_
         where t.id_ = #{musicAlbumId}
     </select>
 
@@ -180,9 +200,13 @@
         left join (select count(1) as num,amr.album_id_
             from album_music_relate amr
             join music_sheet ms on amr.music_sheet_id_ = ms.id_
-            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
-            group by amr.album_id_) t1 on t1.album_id_ = t.id_
-        left join (select count(1) as num,af.album_id_ from album_favorite af group by af.album_id_) t2 on t2.album_id_ = t.id_
+            left join sys_user su on su.id_ = ms.user_id_
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
+        group by amr.album_id_) t1 on t1.album_id_ = t.id_
+        left join (select count(1) as num,af.album_id_ from album_favorite af
+            left join sys_user su on af.user_id_ = su.id_
+            where su.del_flag_ = 0 group by af.album_id_
+        ) t2 on t2.album_id_ = t.id_
         <where>
             t.del_flag_ = 0
             <if test="query.idAndName != null and query.idAndName != ''">

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

@@ -75,6 +75,7 @@
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         <where>
+            su.del_flag_ = 0
             <include refid="QueryInfo"/>
         </where>
         order by  t.id_ desc
@@ -270,6 +271,7 @@
             left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mf.user_id_ = #{param.studentId}
         </if>
         <where>
+            su.del_flag_ = 0
             <include refid="QueryInfo"/>
             <if test="param.auditVersion != null ">
                 and #{param.auditVersion} = t.audit_version_
@@ -314,6 +316,7 @@
         left join sys_user su on t.create_by_ = su.id_
         left join music_favorite mf on t.id_ = mf.music_sheet_id_
         <where>
+            su.del_flag_ = 0
             <include refid="QueryInfo"/>
             <if test="param.studentId != null">
                 and mf.user_id_ = #{param.studentId}
@@ -335,6 +338,7 @@
         left join music_sheet_practice_record mspr on mspr.music_sheet_id_ = t.id_
         left join music_favorite mf on t.id_ = mf.music_sheet_id_ and mspr.user_id_ = mf.user_id_
         <where>
+            su.del_flag_ = 0
             <include refid="QueryInfo"/>
             <if test="practiceMusicIdList != null and practiceMusicIdList.size() != 0">
                 and mspr.id_ in
@@ -454,6 +458,7 @@
         left join music_sheet_auth_record msar on ms.id_ = msar.music_sheet_id_
         left join sys_user su2 on msar.verify_user_id_ = su2.id_
         <where>
+            su.del_flag_ = 0 and
             ms.source_type_  = 'TEACHER'
             <if test="param.idAndName != null and param.idAndName != ''">
                 and (su.id_ like concat('%',#{param.idAndName} ,'%')