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