Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -57,7 +57,7 @@
                     )
             </if>
         </where>
-        order by  t.sort_number_ desc
+        order by  t.sort_number_ desc,t.id_ desc
 	</select>
 
 

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

@@ -334,7 +334,7 @@ public class MusicSheetController extends BaseController {
         query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         query.setMyself(false);
-        query.setRows(21);
+        query.setRows(20);
 
         AppMusicSheetVo appMusicSheetVo = new AppMusicSheetVo();
         // 推荐曲目

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

@@ -75,7 +75,7 @@ public class SysMusicCompareRecordController extends BaseController {
         if (StringUtils.isEmpty(queryInfo.getStartTime())) {
             return failed("时间不能为空");
         }
-        queryInfo.setClientId("teacher");
+        queryInfo.setClientId("student");
         LocalDate localDate = LocalDate.parse(queryInfo.getStartTime() + "-01",
                                               DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         queryInfo.setStartTime(localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));

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

@@ -321,7 +321,7 @@ public class MusicSheetController extends BaseController {
         query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         query.setMyself(false);
-        query.setRows(21);
+        query.setRows(20);
 
         AppMusicSheetVo appMusicSheetVo = new AppMusicSheetVo();
         // 推荐曲目