Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -68,7 +68,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
                 replacementInstrumentActivity.setCooperationOrganName(cooperationOrgan.getName());
             }
         }
-        return replacementInstrumentActivity;
+        return succeed(replacementInstrumentActivity);
     }
 
     @ApiOperation(value = "修改调查问卷")

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

@@ -326,7 +326,10 @@ public class MusicGroupController extends BaseController {
 	@GetMapping("/getGradeList")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/getGradeList')")
 	@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
-	public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId) {
+	public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId,Integer organId) {
+		if(StringUtils.isEmpty(musicGroupId)){
+			return succeed(organizationService.getGradeList(organId));
+		}
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
 		return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
 	}