2.1.0

src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -457,23 +457,25 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
                 throw new BusinessException(JMErrorCode.FAILURE_CODE_20000.code(), JMErrorCode.FAILURE_CODE_20000.message());
             }else{//如果有新增，又有重复，那就是部分导入
                 resCode = JMErrorCode.FAILURE_CODE_20001.code();
+                List<EvidenceParamVO> repeatData = new ArrayList<>();
                 dataList : for (int i = 0; i < param.getDataList().size(); i++) {
                     EvidenceParamVO evidenceParamVO = param.getDataList().get(i);
                     JSONArray media = evidenceParamVO.getData().getJSONArray("media");
                     for (Object m : media) {
                         JSONObject mediaObj = JSON.parseObject(JSON.toJSONString(m));
                         if(repeatMids.contains(mediaObj.getLong("mid"))){
-                            param.getDataList().remove(i);
+                            repeatData.add(evidenceParamVO);
                             continue dataList;
                         }
                     }
                     JSONObject bgm = evidenceParamVO.getData().getJSONObject("bgm");
                     if (Objects.nonNull(bgm)) {
                         if(repeatMids.contains(bgm.getLong("mid"))){
-                            param.getDataList().remove(i);
+                            repeatData.add(evidenceParamVO);
                         }
                     }
                 }
+                param.getDataList().removeAll(repeatData);
                 log.info("-------------新增数据:{}", JSON.toJSONString(param.getDataList()));
             }