Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupStudentMapperServiceImpl.java

@@ -56,8 +56,10 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         classStudentMapper.setStatus(ClassGroupStudentStatusEnum.QUIT);
         update(classStudentMapper);
         StudentRegistration student = studentRegistrationService.findStudentByClassGroupIdAndUserId(userId, classGroupId);
-        student.setClassGroupId(null);
-        studentRegistrationService.update(student);
+        if(student != null) {
+            student.setClassGroupId(0);
+            studentRegistrationService.update(student);
+        }
 
         //2、班级人数调整
         classGroupService.updateClassStudentNum(classGroupId.longValue(), -1);

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -89,6 +89,7 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openPay")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/openPay')")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "expireDate", value = "截止缴费日期", required = true, dataType = "String")