zouxuan преди 4 години
родител
ревизия
f53df65480
променени са 1 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 4 1
      mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

+ 4 - 1
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()));
 	}