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

fix(测试跟踪): 新建功能用例等级字段为非必填时报错 

--bug=1011509 --user=李玉号
[测试跟踪]github#11698新建功能用例，用例等级字段为非必填时，无法把用例新增到最新版本以外的其他版本中。
https://www.tapd.cn/55049933/s/1123065

Closes #11698
This commit is contained in:
shiziyuan9527 2022-03-22 14:04:29 +08:00 committed by 刘瑞斌
parent fc8070e210
commit 2fedefc3ce
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/track/response/TrackStatisticsDTO.java
View File

@ -5,6 +5,7 @@ import io.metersphere.commons.constants.TestReviewCaseStatus;
import io.metersphere.track.request.testcase.TrackCount; import io.metersphere.track.request.testcase.TrackCount;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.List;
@ -110,6 +111,7 @@ public class TrackStatisticsDTO {
*/ */
public void countPriority(List<TrackCountResult> trackCountResults) { public void countPriority(List<TrackCountResult> trackCountResults) {
for (TrackCountResult countResult : trackCountResults) { for (TrackCountResult countResult : trackCountResults) {
if (StringUtils.isNotBlank(countResult.getGroupField())) {
switch (countResult.getGroupField().toUpperCase()){ switch (countResult.getGroupField().toUpperCase()){
case TrackCount.P0: case TrackCount.P0:
this.p0CaseCountNumber += countResult.getCountNumber(); this.p0CaseCountNumber += countResult.getCountNumber();
@ -126,6 +128,7 @@ public class TrackStatisticsDTO {
default: default:
break; break;
} }
}
this.allCaseCountNumber += countResult.getCountNumber(); this.allCaseCountNumber += countResult.getCountNumber();
} }
} }

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

@ -424,8 +424,10 @@ public class TestCaseService {
criteria.andNameEqualTo(testCase.getName()) criteria.andNameEqualTo(testCase.getName())
.andProjectIdEqualTo(testCase.getProjectId()) .andProjectIdEqualTo(testCase.getProjectId())
.andNodePathEqualTo(nodePath) .andNodePathEqualTo(nodePath)
.andTypeEqualTo(testCase.getType()) .andTypeEqualTo(testCase.getType());
.andPriorityEqualTo(testCase.getPriority()); if (StringUtils.isNotBlank(testCase.getPriority())) {
criteria.andPriorityEqualTo(testCase.getPriority());
}
if (StringUtils.isNotBlank(testCase.getTestId())) { if (StringUtils.isNotBlank(testCase.getTestId())) {
criteria.andTestIdEqualTo(testCase.getTestId()); criteria.andTestIdEqualTo(testCase.getTestId());