diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java index b40b9eaf66..f7cb0dfbef 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseNodeService.java @@ -293,6 +293,7 @@ public class TestCaseNodeService extends NodeTreeService { request.setProjectId(projectId); request.setNodeIds(null); ServiceUtils.setBaseQueryRequestCustomMultipleFields(request); + ServiceUtils.buildCombineTagsToSupportMultiple(request); List countModules = extTestCaseMapper.getCountNodes(request); countModules.forEach(item -> item.setProjectId(projectId)); return getNodeTreeWithPruningTree(countModules); diff --git a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java index c469f0ef32..5b3bff99f6 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/TestCaseService.java @@ -2419,6 +2419,7 @@ public class TestCaseService { } public TestCaseExample getBatchExample(TestCaseBatchRequest request) { + ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition()); ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extTestCaseMapper.selectIds(query)); TestCaseExample example = new TestCaseExample(); @@ -2824,6 +2825,7 @@ public class TestCaseService { } public void reduction(TestCaseBatchRequest request) { + ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition()); ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extTestCaseMapper.selectIds(query)); List ids = request.getIds(); if (CollectionUtils.isNotEmpty(ids)) { @@ -3514,6 +3516,7 @@ public class TestCaseService { } public void batchRelateDemand(TestCaseBatchRequest request) { + ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition()); ServiceUtils.getSelectAllIds(request, request.getCondition(), (query) -> extTestCaseMapper.selectIds(query)); if (CollectionUtils.isEmpty(request.getIds())) { diff --git a/test-track/backend/src/main/java/io/metersphere/service/wapper/TrackGraphService.java b/test-track/backend/src/main/java/io/metersphere/service/wapper/TrackGraphService.java index 738af843b1..b5aa312e38 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/wapper/TrackGraphService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/wapper/TrackGraphService.java @@ -4,6 +4,7 @@ import io.metersphere.base.mapper.ext.ExtTestCaseMapper; import io.metersphere.dto.RelationshipGraphData; import io.metersphere.request.GraphBatchRequest; import io.metersphere.service.GraphService; +import io.metersphere.service.ServiceUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +23,7 @@ public class TrackGraphService { public RelationshipGraphData getGraphDataByCondition(GraphBatchRequest request, String type) { request.getCondition().setNotEqStatus("Trash"); + ServiceUtils.buildCombineTagsToSupportMultiple(request.getCondition()); return graphService.getGraphDataByCondition(request, extTestCaseMapper::selectIds, extTestCaseMapper::getTestCaseForGraph); } }