fix:老师曲目排序

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -57,7 +57,7 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
-    @ApiModelProperty(value = "查看我自己的曲目",required = true)
+    @ApiModelProperty(value = "查看我自己的曲目")
     private Boolean myself;
 
 

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

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

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

@@ -129,8 +129,7 @@ public class MusicSheetController extends BaseController {
             query.setCreateBy(sysUser.getId());
             if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {
                 query.setState(YesOrNoEnum.YES);
-            }
-            if (query.getAuditStatus() != null && AuthStatusEnum.OUT_SALE.getCode().equals(query.getAuditStatus().getCode())) {
+            } else if (query.getAuditStatus() != null && AuthStatusEnum.OUT_SALE.getCode().equals(query.getAuditStatus().getCode())) {
                 query.setState(YesOrNoEnum.NO);
                 query.setAuditStatus(AuthStatusEnum.PASS);
             }
@@ -147,7 +146,7 @@ public class MusicSheetController extends BaseController {
             query.setMyself(false);
         }
 
-        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
+        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
 

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

@@ -108,6 +108,7 @@ public class MusicSheetController extends BaseController {
             query.setState(YesOrNoEnum.YES);
         }
         query.setSourceType(SourceTypeEnum.TEACHER);
+        query.setMyself(true);
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);