Merge remote-tracking branch 'origin/dev_1_2_20220802' into dev_1_2_20220802

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

@@ -89,9 +89,7 @@
                 </when>
             </choose>
         </if>
-        <if test="query.sortBy == null">
-            ,t.id_ desc
-        </if>
+        ,t.id_ desc
     </select>
 
     <select id="selectFavoritePage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo">
@@ -240,8 +238,6 @@
                 </when>
             </choose>
         </if>
-        <if test="query.sortBy == null">
-            ,t.id_ desc
-        </if>
+        ,t.id_ desc
     </select>
 </mapper>

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

@@ -288,7 +288,7 @@
                 and #{param.auditVersion} = t.audit_version_
             </if>
         </where>
-        order by t2.num desc,  t.id_ desc
+        order by t.top_flag_ desc, t.sort_number_ desc, t2.num desc,  t.id_ desc
     </select>
 
     <select id="selectMyMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">