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

fix(测试跟踪):修复用例excel导入时重复校验不准确问题。 (#1756) 

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
This commit is contained in:
Ambitiousliga 2021-03-30 16:19:23 +08:00 committed by chenjianxing
parent 5c70925360
commit 2534eafcf0
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,25 +182,19 @@ public class TestCaseService {
List<TestCaseWithBLOBs> caseList = testCaseMapper.selectByExampleWithBLOBs(example); List<TestCaseWithBLOBs> caseList = testCaseMapper.selectByExampleWithBLOBs(example);
// 如果上边字段全部相同，去检查 steps 和 remark // 如果上边字段全部相同，去检查 remark 和 steps
boolean isExt = false;
String caseRemark = testCase.getRemark();
if (StringUtils.isBlank(caseRemark)) {
caseRemark = "";
}
if (!CollectionUtils.isEmpty(caseList)) { if (!CollectionUtils.isEmpty(caseList)) {
String caseRemark = testCase.getRemark();
String caseSteps = testCase.getSteps();
for (TestCaseWithBLOBs tc : caseList) { for (TestCaseWithBLOBs tc : caseList) {
String steps = tc.getSteps(); String steps = tc.getSteps();
String remark = tc.getRemark(); String remark = tc.getRemark();
if (StringUtils.equals(steps, testCase.getSteps()) && StringUtils.equals(remark, caseRemark)) { if (StringUtils.equals(steps, caseSteps) && StringUtils.equals(remark, caseRemark)) {
//MSException.throwException(Translator.get("test_case_already_exists")); //MSException.throwException(Translator.get("test_case_already_exists"));
isExt = true; return tc;
} }
} }
} }
if (isExt) {
return caseList.get(0);
}
} }
return null; return null;
} }