Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherAuditMusicSheetVo.java

@@ -12,13 +12,13 @@ import io.swagger.annotations.ApiModelProperty;
 public class TeacherAuditMusicSheetVo {
 
     @ApiModelProperty("审核通过数量")
-    private Integer pass;
+    private Integer pass = 0;
 
     @ApiModelProperty("审核拒绝数量")
-    private Integer unPass;
+    private Integer unPass= 0;
 
     @ApiModelProperty("审核中数量")
-    private Integer doing;
+    private Integer doing= 0;
 
 
     @ApiModelProperty("分页数据")

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

@@ -111,6 +111,9 @@ public class MusicSheetController extends BaseController {
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
 
         TeacherAuditMusicSheetVo teacherAuditMusicSheetVo = musicSheetService.selectTeacherCount(sysUser.getId());
+        if (teacherAuditMusicSheetVo == null) {
+            teacherAuditMusicSheetVo = new TeacherAuditMusicSheetVo();
+        }
         teacherAuditMusicSheetVo.setList(PageUtil.pageInfo(musicSheetVoIPage));
         return succeed(teacherAuditMusicSheetVo);
     }