Merge branch 'dev_20230202'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/OpenUserAccountController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/open")
@@ -62,7 +63,10 @@ public class OpenUserAccountController extends BaseController {
 
     @ApiOperation(value = "曲目数据修复")
     @PostMapping(value="/music/sheet/musicCorrect")
-    public HttpResponseResult<Boolean> musicCorrect(@RequestBody @Valid MusicImgDto musicImgDto) {
+    public HttpResponseResult<Boolean> musicCorrect(@RequestBody MusicImgDto musicImgDto) {
+        if (Objects.isNull(musicImgDto.getMusicSheetId())) {
+            failed("曲目Id参数错误");
+        }
         return succeed(musicSheetService.updateMusicCorrect(musicImgDto, musicImgDto.getMusicSheetId()));
     }
 

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

@@ -154,7 +154,8 @@ public class OpenMusicSheetController extends BaseController {
 
     @ApiOperation(value = "新增曲谱渲染图")
     @PostMapping(value="/img")
-    public HttpResponseResult<Boolean> img(@RequestBody @Valid MusicImgDto musicImgDto) {
+    public HttpResponseResult<Boolean>
+    img(@RequestBody @Valid MusicImgDto musicImgDto) {
         return succeed(musicSheetService.updateMusicImg(musicImgDto, musicImgDto.getMusicSheetId()));
     }