Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into test

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

@@ -156,7 +156,7 @@ public class MusicSheetController extends BaseController {
         }
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query, ClientEnum.TEACHER);
-        if(auditStatus != null && !auditStatus.getCode().equals(query.getAuditStatus().getCode())){
+        if(auditStatus != null && !auditStatus.equals(AuthStatusEnum.PASS)){
             return succeed(PageUtil.pageInfo(musicSheetAuthRecordService.convertMusicDetail(musicSheetVoIPage,query.getAuditStatus())));
         }
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));

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

@@ -156,7 +156,7 @@ public class MusicSheetController extends BaseController {
         }
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
         teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetVoIPage));
-        if(auditStatus != null && !auditStatus.getCode().equals(query.getAuditStatus().getCode())){
+        if(auditStatus != null && !auditStatus.equals(AuthStatusEnum.PASS)){
             teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetAuthRecordService.convertMusicDetail(musicSheetVoIPage, query.getAuditStatus())));
         }
         return succeed(teacherAuditMusicSheetVo);

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

@@ -66,7 +66,7 @@
                 and su2.username_ like concat('%',#{param.auditName},'%')
             </if>
             <if test="param.authStatus != null">
-                and msar.last_audit_state_ = #{param.authStatus}
+                and msar.audit_state_ = #{param.authStatus}
                 <if test="param.authStatus == 'PASS'">
                     AND ms.state_ = 1
                 </if>
@@ -74,6 +74,9 @@
                     AND ms.state_ = 0
                 </if>
             </if>
+            <if test="param.authStatus == null || param.authStatus == ''">
+                and msar.audit_state_ = msar.last_audit_state_
+            </if>
             <if test="param.createBy != null">
                 and ms.create_by_ = #{param.createBy}
             </if>