From 5e58bf9e179a53c814ef656579dcc4365c55da70 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 27 Oct 2022 14:47:48 +0800 Subject: [PATCH] =?UTF-8?q?revert(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E5=9B=9E=E9=80=80=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89id=E4=B8=8E=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=AB=99=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001018278 --- .../io/metersphere/service/scenario/ApiScenarioService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioService.java b/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioService.java index 9d7bde284c..8a4e6b6fb3 100644 --- a/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioService.java +++ b/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioService.java @@ -326,7 +326,7 @@ public class ApiScenarioService { String id = request.getId(); ApiScenarioWithBLOBs apiScenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(id); ApiScenarioExample.Criteria criteria = example.createCriteria(); - criteria.andCustomNumEqualTo(request.getCustomNum()).andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(id).andStatusNotEqualTo(ApiTestDataStatus.TRASH.getValue()); + criteria.andCustomNumEqualTo(request.getCustomNum()).andProjectIdEqualTo(request.getProjectId()).andIdNotEqualTo(id); if (apiScenarioWithBLOBs != null && StringUtils.isNotBlank(apiScenarioWithBLOBs.getRefId())) { criteria.andRefIdNotEqualTo(apiScenarioWithBLOBs.getRefId()); } @@ -1262,7 +1262,6 @@ public class ApiScenarioService { if (BooleanUtils.isTrue(openCustomNum)) { ApiScenarioExample example = new ApiScenarioExample(); ApiScenarioExample.Criteria criteria = example.createCriteria(); - criteria.andStatusNotEqualTo(ApiTestDataStatus.TRASH.getValue()); if (CollectionUtils.isEmpty(sameList)) { criteria.andCustomNumEqualTo(scenarioWithBLOBs.getCustomNum()).andProjectIdEqualTo(scenarioWithBLOBs.getProjectId()); } else {