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

fix(接口测试): 修复工作台是否覆盖跳转时模块树没有级联统计的问题

This commit is contained in:
Jianguo-Genius 2024-12-19 15:44:17 +08:00 committed by Craftsman
parent 685c5b45a7
commit 93d6d488a5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionModuleService.java
View File

@ -74,9 +74,7 @@ public class ApiDefinitionModuleService extends ModuleTreeService {
if (!containRequest || CollectionUtils.isEmpty(request.getProtocols())) { if (!containRequest || CollectionUtils.isEmpty(request.getProtocols())) {
return baseTreeNodes; return baseTreeNodes;
} }
ApiDefinitionService apiDefinitionService = CommonBeanFactory.getBean(ApiDefinitionService.class);
request.setExcludeIds(apiDefinitionService.getQueryExcludeIds(request.getFilter(), request.getProjectId(), request.getProtocols()));
request.setIncludeIds(apiDefinitionService.getQueryIncludeIds(request.getFilter(), request.getProjectId(), request.getProtocols()));
List<ApiTreeNode> apiTreeNodeList = extApiDefinitionModuleMapper.selectApiDataByRequest(request, deleted); List<ApiTreeNode> apiTreeNodeList = extApiDefinitionModuleMapper.selectApiDataByRequest(request, deleted);
return apiDebugModuleService.getBaseTreeNodes(apiTreeNodeList, baseTreeNodes); return apiDebugModuleService.getBaseTreeNodes(apiTreeNodeList, baseTreeNodes);
@ -275,6 +273,11 @@ public class ApiDefinitionModuleService extends ModuleTreeService {
isRepeat = this.checkTestPlanRepeatCase(request); isRepeat = this.checkTestPlanRepeatCase(request);
} }
request.setModuleIds(null); request.setModuleIds(null);
ApiDefinitionService apiDefinitionService = CommonBeanFactory.getBean(ApiDefinitionService.class);
request.setExcludeIds(apiDefinitionService.getQueryExcludeIds(request.getFilter(), request.getProjectId(), request.getProtocols()));
request.setIncludeIds(apiDefinitionService.getQueryIncludeIds(request.getFilter(), request.getProjectId(), request.getProtocols()));
//查找根据moduleIds查找模块下的接口数量 查非delete状态的 //查找根据moduleIds查找模块下的接口数量 查非delete状态的
List<ModuleCountDTO> moduleCountDTOList = extApiDefinitionModuleMapper.countModuleIdByRequest(request, deleted, isRepeat); List<ModuleCountDTO> moduleCountDTOList = extApiDefinitionModuleMapper.countModuleIdByRequest(request, deleted, isRepeat);
long allCount = getAllCount(moduleCountDTOList); long allCount = getAllCount(moduleCountDTOList);