Merge branch 'dev_v1.3.4_20220919'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -217,7 +217,7 @@ public class MusicSheet implements Serializable {
 	private Boolean delFlag;
 
 	public String getMusicImg() {
-		return Optional.ofNullable(musicImg).orElse("");
+		return musicImg;
 	}
 
 	public void setMusicImg(String musicImg) {
@@ -437,7 +437,7 @@ public class MusicSheet implements Serializable {
 	}
 
 	public String getAudioFileUrl() {
-		return Optional.ofNullable(audioFileUrl).orElse("");
+		return audioFileUrl;
 	}
 
 	public void setAudioFileUrl(String audioFileUrl) {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -76,7 +76,17 @@ public class MusicSheetController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(musicSheetService.detail(id, sysUser, ClientEnum.TEACHER));
+
+        MusicSheetDetailVo detail = musicSheetService.detail(id, sysUser, ClientEnum.TEACHER);
+
+        // 设置返回默认值
+        if (StringUtil.isEmpty(detail.getAudioFileUrl())) {
+            detail.setAudioFileUrl("");
+        }
+        if (StringUtils.isEmpty(detail.getMusicImg())) {
+            detail.setMusicImg("");
+        }
+        return succeed(detail);
     }
 
 	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")