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

fix(功能用例): 创建其他版本用例，提示ID已存在

This commit is contained in:
shiziyuan9527 2022-01-25 14:19:19 +08:00 committed by shiziyuan9527
parent 5257b536b7
commit 790cbcd0c3
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -251,11 +251,16 @@ public class TestCaseService {
} }
private void checkCustomNumExist(TestCaseWithBLOBs testCase) { private void checkCustomNumExist(TestCaseWithBLOBs testCase) {
String id = testCase.getId();
TestCaseWithBLOBs testCaseWithBLOBs = testCaseMapper.selectByPrimaryKey(id);
TestCaseExample example = new TestCaseExample(); TestCaseExample example = new TestCaseExample();
example.createCriteria() TestCaseExample.Criteria criteria = example.createCriteria();
.andCustomNumEqualTo(testCase.getCustomNum()) criteria.andCustomNumEqualTo(testCase.getCustomNum())
.andProjectIdEqualTo(testCase.getProjectId()) .andProjectIdEqualTo(testCase.getProjectId())
.andIdNotEqualTo(testCase.getId()); .andIdNotEqualTo(testCase.getId());
if (testCaseWithBLOBs != null && StringUtils.isNotBlank(testCaseWithBLOBs.getRefId())) {
criteria.andRefIdNotEqualTo(testCaseWithBLOBs.getRefId());
}
List<TestCase> list = testCaseMapper.selectByExample(example); List<TestCase> list = testCaseMapper.selectByExample(example);
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
MSException.throwException(Translator.get("custom_num_is_exist")); MSException.throwException(Translator.get("custom_num_is_exist"));
@ -282,6 +287,18 @@ public class TestCaseService {
example.getOredCriteria().get(0).andVersionIdEqualTo(testCase.getVersionId()); example.getOredCriteria().get(0).andVersionIdEqualTo(testCase.getVersionId());
} }
createNewVersionOrNot(testCase, example); createNewVersionOrNot(testCase, example);
if (StringUtils.isNotBlank(testCase.getCustomNum()) && StringUtils.isNotBlank(testCase.getId())) {
TestCaseWithBLOBs caseWithBLOBs = testCaseMapper.selectByPrimaryKey(testCase.getId());
if (caseWithBLOBs != null) {
example.clear();
example.createCriteria().andRefIdEqualTo(caseWithBLOBs.getRefId());
TestCaseWithBLOBs testCaseWithBLOBs = new TestCaseWithBLOBs();
testCaseWithBLOBs.setCustomNum(testCase.getCustomNum());
testCaseMapper.updateByExampleSelective(testCaseWithBLOBs, example);
}
}
testCase.setLatest(null); testCase.setLatest(null);
testCaseMapper.updateByPrimaryKeySelective(testCase); testCaseMapper.updateByPrimaryKeySelective(testCase);
return testCaseMapper.selectByPrimaryKey(testCase.getId()); return testCaseMapper.selectByPrimaryKey(testCase.getId());