|
@@ -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);
|