111

src/main/java/com/fdkankan/modeldemo/utils/ConvertUtil.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.modeldemo.bean.SceneEditControlsBean;
 import com.fdkankan.modeldemo.bean.SceneJsonBean;
 import com.fdkankan.modeldemo.constant.Constant;
@@ -182,10 +183,20 @@ public class ConvertUtil {
             sceneFileMappingService.save(sceneFileMapping);
         });
 
-        Scene scene = sceneService.getByNum(num);
-        if(Objects.isNull(scene)){
+        List<Scene> list = sceneService.list(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
+//        Scene scene = sceneService.getByNum(num);
+        Scene scene = null;
+        if(CollUtil.isEmpty(list)){
             scene = new Scene();
+        }else{
+            if(list.size() > 1){
+                sceneService.remove(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num));
+                scene = new Scene();
+            }else{
+                scene = list.get(0);
+            }
         }
+
         scene.setTitle(title);
         scene.setNum(num);
         scene.setFloorlogosize(100);