Browse Source

sceneProEdit.getBgMusic() == noMusic/0 music字段置空

dengsixing 3 years ago
parent
commit
ddb550c6a7

+ 5 - 1
src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -248,7 +248,11 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 sceneEditInfo.setFloorLogo(sceneProEdit.getFloorLogo());
                 sceneEditInfo.setFloorLogoSize(sceneProEdit.getFloorLogoSize());
                 sceneEditInfo.setFloorLogoFile("user".equals(sceneProEdit.getFloorLogo()) ? "floorLogo-user.png" : null);    //floorLogoImg.png -> floorLogo-user.png
-                sceneEditInfo.setMusic("noMusic".equals(sceneProEdit.getBgMusic()) ? null : sceneProEdit.getBgMusic());
+                String music = null;
+                if(!"noMusic".equals(sceneProEdit.getBgMusic()) && !"0".equals(sceneProEdit.getBgMusic())){
+                    music = sceneProEdit.getBgMusic();
+                }
+                sceneEditInfo.setMusic(music);
                 //如果bgmusicname 不为空  ,MusicFile = BgMusicName
                 if(StrUtil.isNotEmpty(sceneProEditExt.getBgMusicName())){
                     sceneEditInfo.setMusicFile(sceneProEditExt.getBgMusicName());