Merge remote-tracking branch 'origin/master'

2021-01-27 16:53:34 +08:00 · 2021-01-27 16:53:34 +08:00 · 0011112f8b
parent 8fcaf73890 97a99f8006
commit 0011112f8b
1 changed files with 3 additions and 1 deletions
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@ -323,7 +323,9 @@ public class ApiDefinitionService {
                apiDefinitionMapper.updateByPrimaryKeyWithBLOBs(apiDefinition);
            }
        } else if (StringUtils.equals("incrementalMerge", apiTestImportRequest.getModeId())) {
+            if (CollectionUtils.isEmpty(sameRequest)) {
                batchMapper.insert(apiDefinition);
+            }
        } else {
            if (CollectionUtils.isEmpty(sameRequest)) {
                batchMapper.insert(apiDefinition);