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

fix(测试跟踪): 回收站标签搜索问题&标签导致的所有批量操作问题 

--bug=1043863 --user=王旭 【测试跟踪】功能用例-回收站-筛选标签-报错 https://www.tapd.cn/55049933/s/1546966
This commit is contained in:
WangXu10 2024-07-11 17:19:00 +08:00 committed by 刘瑞斌
parent 6eec2069b1
commit 9ee888df79
3 changed files with 6 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/TestCaseNodeService.java
View File

@ -293,6 +293,7 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
request.setProjectId(projectId); request.setProjectId(projectId);
request.setNodeIds(null); request.setNodeIds(null);
ServiceUtils.setBaseQueryRequestCustomMultipleFields(request); ServiceUtils.setBaseQueryRequestCustomMultipleFields(request);
ServiceUtils.buildCombineTagsToSupportMultiple(request);
List<TestCaseNodeDTO> countModules = extTestCaseMapper.getCountNodes(request); List<TestCaseNodeDTO> countModules = extTestCaseMapper.getCountNodes(request);
countModules.forEach(item -> item.setProjectId(projectId)); countModules.forEach(item -> item.setProjectId(projectId));
return getNodeTreeWithPruningTree(countModules); return getNodeTreeWithPruningTree(countModules);

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

@ -2419,6 +2419,7 @@ public class TestCaseService {
} }
public TestCaseExample getBatchExample(TestCaseBatchRequest request) { public TestCaseExample getBatchExample(TestCaseBatchRequest request) {
ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition());
ServiceUtils.getSelectAllIds(request, request.getCondition(), ServiceUtils.getSelectAllIds(request, request.getCondition(),
(query) -> extTestCaseMapper.selectIds(query)); (query) -> extTestCaseMapper.selectIds(query));
TestCaseExample example = new TestCaseExample(); TestCaseExample example = new TestCaseExample();
@ -2824,6 +2825,7 @@ public class TestCaseService {
} }
public void reduction(TestCaseBatchRequest request) { public void reduction(TestCaseBatchRequest request) {
ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition());
ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extTestCaseMapper.selectIds(query)); ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extTestCaseMapper.selectIds(query));
List<String> ids = request.getIds(); List<String> ids = request.getIds();
if (CollectionUtils.isNotEmpty(ids)) { if (CollectionUtils.isNotEmpty(ids)) {
@ -3514,6 +3516,7 @@ public class TestCaseService {
} }
public void batchRelateDemand(TestCaseBatchRequest request) { public void batchRelateDemand(TestCaseBatchRequest request) {
ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition());
ServiceUtils.getSelectAllIds(request, request.getCondition(), ServiceUtils.getSelectAllIds(request, request.getCondition(),
(query) -> extTestCaseMapper.selectIds(query)); (query) -> extTestCaseMapper.selectIds(query));
if (CollectionUtils.isEmpty(request.getIds())) { if (CollectionUtils.isEmpty(request.getIds())) {

2
test-track/backend/src/main/java/io/metersphere/service/wapper/TrackGraphService.java
View File

@ -4,6 +4,7 @@ import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
import io.metersphere.dto.RelationshipGraphData; import io.metersphere.dto.RelationshipGraphData;
import io.metersphere.request.GraphBatchRequest; import io.metersphere.request.GraphBatchRequest;
import io.metersphere.service.GraphService; import io.metersphere.service.GraphService;
import io.metersphere.service.ServiceUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -22,6 +23,7 @@ public class TrackGraphService {
public RelationshipGraphData getGraphDataByCondition(GraphBatchRequest request, String type) { public RelationshipGraphData getGraphDataByCondition(GraphBatchRequest request, String type) {
request.getCondition().setNotEqStatus("Trash"); request.getCondition().setNotEqStatus("Trash");
ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition());
return graphService.getGraphDataByCondition(request, extTestCaseMapper::selectIds, extTestCaseMapper::getTestCaseForGraph); return graphService.getGraphDataByCondition(request, extTestCaseMapper::selectIds, extTestCaseMapper::getTestCaseForGraph);
} }
} }