test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试跟踪): 功能用例检测自定义ID存在时，没有忽略回收站用例 

--bug=1018201 --user=陈建星 【测试跟踪】导入用例-开启“测试用例自定义ID”-导入后编辑用例提示ID已存在 https://www.tapd.cn/55049933/s/1263408
This commit is contained in:
chenjianxing 2022-10-17 10:51:10 +08:00 committed by jianxing
parent cc7ae74c7f
commit d202da7cde
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java
View File

@ -356,6 +356,7 @@ public class TestCaseService {
TestCaseExample.Criteria criteria = example.createCriteria(); TestCaseExample.Criteria criteria = example.createCriteria();
criteria.andCustomNumEqualTo(testCase.getCustomNum()) criteria.andCustomNumEqualTo(testCase.getCustomNum())
.andProjectIdEqualTo(testCase.getProjectId()) .andProjectIdEqualTo(testCase.getProjectId())
.andStatusNotEqualTo(CommonConstants.TrashStatus)
.andIdNotEqualTo(testCase.getId()); .andIdNotEqualTo(testCase.getId());
if (testCaseWithBLOBs != null && StringUtils.isNotBlank(testCaseWithBLOBs.getRefId())) { if (testCaseWithBLOBs != null && StringUtils.isNotBlank(testCaseWithBLOBs.getRefId())) {
criteria.andRefIdNotEqualTo(testCaseWithBLOBs.getRefId()); criteria.andRefIdNotEqualTo(testCaseWithBLOBs.getRefId());