Explorar o código

酷乐秀曲目来源改为内容平台

zouxuan hai 1 ano
pai
achega
09cabd2122

+ 2 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -120,6 +120,7 @@ public class MusicSheetController extends BaseController {
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody StudentMusicSheetSearch query) {
         SysUser sysUser = sysUserService.getUser();
         // 老师课查看所有曲目
+        AuthStatusEnum auditStatus = query.getAuditStatus();
         if (query.getMyself() == null || query.getMyself()) {
             // 设置只查老师用户 状态为启用
             query.setCreateBy(sysUser.getId());
@@ -155,7 +156,7 @@ public class MusicSheetController extends BaseController {
         }
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.TEACHER);
-        if(query.getAuditStatus() != null && !AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())){
+        if(auditStatus != null && !auditStatus.getCode().equals(query.getAuditStatus().getCode())){
             return succeed(PageUtil.pageInfo(musicSheetAuthRecordService.convertMusicDetail(musicSheetVoIPage,query.getAuditStatus())));
         }
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));

+ 2 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -136,6 +136,7 @@ public class MusicSheetController extends BaseController {
         }
         // 设置只查老师用户 状态为启用
         query.setCreateBy(sysUser.getId());
+        AuthStatusEnum auditStatus = query.getAuditStatus();
         if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {
             query.setState(YesOrNoEnum.YES);
         } else if (query.getAuditStatus() != null && AuthStatusEnum.OUT_SALE.getCode().equals(query.getAuditStatus().getCode())) {
@@ -155,7 +156,7 @@ public class MusicSheetController extends BaseController {
         }
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
         teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetVoIPage));
-        if(query.getAuditStatus() != null && !AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())){
+        if(auditStatus != null && !auditStatus.getCode().equals(query.getAuditStatus().getCode())){
             teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetAuthRecordService.convertMusicDetail(musicSheetVoIPage, query.getAuditStatus())));
         }
         return succeed(teacherAuditMusicSheetVo);