diff --git a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java index 8329b8bef6..7470f4773e 100644 --- a/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java +++ b/backend/src/main/java/io/metersphere/excel/listener/TestCaseNoModelDataListener.java @@ -14,6 +14,7 @@ import io.metersphere.dto.CustomFieldDao; import io.metersphere.excel.annotation.NotRequired; import io.metersphere.excel.domain.ExcelErrData; import io.metersphere.excel.domain.TestCaseExcelData; +import io.metersphere.excel.domain.TestCaseExcelDataFactory; import io.metersphere.excel.utils.ExcelValidateHelper; import io.metersphere.excel.utils.FunctionCaseImportEnum; import io.metersphere.i18n.Translator; @@ -612,7 +613,7 @@ public class TestCaseNoModelDataListener extends AnalysisEventListener row) { - TestCaseExcelData data = new TestCaseExcelData(); + TestCaseExcelData data = new TestCaseExcelDataFactory().getTestCaseExcelDataLocal(); for (Map.Entry headEntry: headMap.entrySet()) { Integer index = headEntry.getKey(); String field = headEntry.getValue(); diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java index 5b0b30925f..62e5bbdba3 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -476,7 +476,8 @@ public class TestCaseService { criteria.andNameEqualTo(testCase.getName()) .andProjectIdEqualTo(testCase.getProjectId()) .andNodePathEqualTo(nodePath) - .andTypeEqualTo(testCase.getType()); + .andTypeEqualTo(testCase.getType()) + .andStatusNotEqualTo("Trash"); if (StringUtils.isNotBlank(testCase.getPriority())) { criteria.andPriorityEqualTo(testCase.getPriority()); }