Merge branch 'online_dev_20230606'

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

@@ -239,6 +239,9 @@
         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_
+        <if test="clientType != null and query.userId != null">
+            left join music_sheet_purchase_record t3 on t3.music_sheet_id_ = t.id_ and t3.client_type_ = #{clientType} and t3.student_id_ = #{query.userId}
+        </if>
         <where>
             t.del_flag_ = 0
             <if test="query.idAndName != null and query.idAndName != ''">
@@ -264,7 +267,12 @@
                 and t.audit_version_ = #{query.auditVersion}
             </if>
         </where>
-        order by t.sort_number_ desc
+        order by
+        <if test="clientType != null and query.userId != null">
+            field(t3.id_,null,t3.id_) desc,
+        </if>
+
+        t.sort_number_ desc
         <if test="query.sortBy != null">
             <choose>
                 <when test="query.sortBy == 1">

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -88,6 +88,7 @@ public class MusicAlbumController extends BaseController {
         // query.setSubjectIds(student.getSubjectId());
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
+        query.setUserId(sysUser.getId());
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query, ClientEnum.STUDENT);
         return succeed(PageUtil.pageInfo(iPage));
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicAlbumController.java

@@ -95,6 +95,7 @@ public class MusicAlbumController extends BaseController {
 
         query.setAlbumStatus(YesOrNoEnum.YES);
         query.setSortBy(1);
+        query.setUserId(sysUser.getId());
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectStudentPage(PageUtil.getPage(query),query, ClientEnum.TEACHER);
         return succeed(PageUtil.pageInfo(iPage));
     }