From d202da7cdeb698ac37d20440ee73ae259894e1ed Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 17 Oct 2022 10:51:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E6=A3=80=E6=B5=8B=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89ID=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=BF=BD=E7=95=A5=E5=9B=9E=E6=94=B6=E7=AB=99?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018201 --user=陈建星 【测试跟踪】导入用例-开启“测试用例自定义ID”-导入后编辑用例提示ID已存在 https://www.tapd.cn/55049933/s/1263408
---
 .../src/main/java/io/metersphere/service/TestCaseService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
index d6dd8309b9..31065b83bb 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
@@ -356,6 +356,7 @@ public class TestCaseService {
         TestCaseExample.Criteria criteria = example.createCriteria();
         criteria.andCustomNumEqualTo(testCase.getCustomNum())
                 .andProjectIdEqualTo(testCase.getProjectId())
+                .andStatusNotEqualTo(CommonConstants.TrashStatus)
                 .andIdNotEqualTo(testCase.getId());
         if (testCaseWithBLOBs != null && StringUtils.isNotBlank(testCaseWithBLOBs.getRefId())) {
             criteria.andRefIdNotEqualTo(testCaseWithBLOBs.getRefId());