排序

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetCbsController.java

@@ -155,7 +155,7 @@ public class MusicSheetCbsController extends BaseController {
         query.setClientType(ClientEnum.STUDENT.name());
 
         if (query.getMusicSheetId() !=null) {
-            MusicSheet musicSheet = musicSheetService.getById(query.getMusicSheetId());
+            MusicSheet musicSheet = musicSheetService.getById(query.getExcludeMusicId());
             if (musicSheet == null) {
                 return failed("曲目不存在");
             }

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

@@ -1453,16 +1453,15 @@
         </where>
 
         GROUP BY t.id_
+        order by
         <if test="param.recentFlag !=null and param.recentFlag == true">
-            order by
-            max(msar.create_time_) desc
+            max(msar.create_time_) desc,
         </if>
         <if test="param.favoriteFlag != null and param.favoriteFlag == 1">
-            order by mf.id_ desc
-        </if>
-        <if test="param.recentFlag == null">
-            order by tam.level_,tam.type_,tam.sort_number_
+            mf.id_ desc,
         </if>
+
+        t.sort_group_, t.sort_num_, t.sort_num2_, t.alias_
     </select>
     <!--单曲专辑数量统计-->
 </mapper>