Merge branch 'hotfix-35546-20230327-dsx' into test

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -863,8 +863,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 sceneEditInfo.setScenePassword(sceneKey);
                 sceneEditControls.setShowLock((int) CommonStatus.YES.code());
             }
-
             sceneEditInfoService.save(sceneEditInfo);
+
+            sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
+            sceneEditInfoExt.setScenePlusId(scenePlus.getId());
+            sceneEditInfoExtService.save(sceneEditInfoExt);
+
             sceneEditControls.setEditInfoId(sceneEditInfo.getId());
             sceneEditControlsService.save(sceneEditControls);
 
@@ -921,11 +925,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             sceneEditInfo.setVersion(oldSceneEditInfo.getVersion() + 1);
             sceneEditInfoService.updateById(sceneEditInfo);
 
-            sceneEditInfoExt.setId(oldSceneEditeIinfoExt.getId());
+            if(Objects.nonNull(oldSceneEditeIinfoExt)){
+                sceneEditInfoExt.setId(oldSceneEditeIinfoExt.getId());
+            }
             sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
             sceneEditInfoExt.setScenePlusId(scenePlus.getId());
-            sceneEditInfoExtService.updateById(sceneEditInfoExt);
-
+            sceneEditInfoExtService.saveOrUpdate(sceneEditInfoExt);
         }
 
         BeanUtil.copyProperties(scenePlusExt, scenePlusVO);