Merge branch 'feature-v4.4.0-20221019' into test

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -353,13 +353,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             return;
         }
 
+        JSONArray jsonArray = new JSONArray();
         String boxModels = sceneEditInfo.getBoxModels();
-        if(StrUtil.isEmpty(boxModels)){
-            return;
-        }
-        JSONArray jsonArray = JSON.parseArray(boxModels);
-        if(CollUtil.isEmpty(jsonArray)){
-            return;
+        if(StrUtil.isNotEmpty(boxModels)){
+            jsonArray = JSON.parseArray(boxModels);
         }
         Set<String> sidSet = jsonArray.stream().map(o -> {
             JSONObject item = (JSONObject) o;