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

reverse: 回退检查默认模块并创建的逻辑

This commit is contained in:
chenjianxing 2022-06-17 11:33:42 +08:00 committed by f2c-ci-robot[bot]
parent 4d988ef348
commit b6b83b998d
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
View File

@ -73,6 +73,8 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
} }
public List<ApiModuleDTO> getNodeTreeByProjectId(String projectId, String protocol, String versionId) { public List<ApiModuleDTO> getNodeTreeByProjectId(String projectId, String protocol, String versionId) {
// 判断当前项目下是否有默认模块，没有添加默认模块
this.getDefaultNode(projectId, protocol);
List<ApiModuleDTO> apiModules = extApiModuleMapper.getNodeTreeByProjectId(projectId, protocol); List<ApiModuleDTO> apiModules = extApiModuleMapper.getNodeTreeByProjectId(projectId, protocol);
ApiDefinitionRequest request = new ApiDefinitionRequest(); ApiDefinitionRequest request = new ApiDefinitionRequest();
request.setProjectId(projectId); request.setProjectId(projectId);

2
backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
View File

@ -62,6 +62,8 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
} }
public List<ApiScenarioModuleDTO> getNodeTreeByProjectId(String projectId) { public List<ApiScenarioModuleDTO> getNodeTreeByProjectId(String projectId) {
// 判断当前项目下是否有默认模块，没有添加默认模块
this.getDefaultNode(projectId);
List<ApiScenarioModuleDTO> nodes = extApiScenarioModuleMapper.getNodeTreeByProjectId(projectId); List<ApiScenarioModuleDTO> nodes = extApiScenarioModuleMapper.getNodeTreeByProjectId(projectId);
ApiScenarioRequest request = new ApiScenarioRequest(); ApiScenarioRequest request = new ApiScenarioRequest();
request.setProjectId(projectId); request.setProjectId(projectId);

3
backend/src/main/java/io/metersphere/service/BaseModuleService.java
View File

@ -133,6 +133,9 @@ public class BaseModuleService extends NodeTreeService<ModuleNodeDTO> {
} }
public List<ModuleNodeDTO> getNodeTreeByProjectIdWithCount(String projectId, Function<QueryNodeRequest, List<Map<String, Object>>> getModuleCountFunc, String defaultName) { public List<ModuleNodeDTO> getNodeTreeByProjectIdWithCount(String projectId, Function<QueryNodeRequest, List<Map<String, Object>>> getModuleCountFunc, String defaultName) {
// 判断当前项目下是否有默认模块，没有添加默认模块
this.getDefaultNode(projectId, defaultName);
List<ModuleNodeDTO> moduleNodes = extModuleNodeMapper.getNodeTreeByProjectId(tableName, projectId); List<ModuleNodeDTO> moduleNodes = extModuleNodeMapper.getNodeTreeByProjectId(tableName, projectId);
if (getModuleCountFunc != null) { if (getModuleCountFunc != null) {
buildNodeCount(projectId, moduleNodes, getModuleCountFunc); buildNodeCount(projectId, moduleNodes, getModuleCountFunc);

2
backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
View File

@ -148,6 +148,8 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
} }
public List<TestCaseNodeDTO> getNodeTreeByProjectId(String projectId, QueryTestCaseRequest request) { public List<TestCaseNodeDTO> getNodeTreeByProjectId(String projectId, QueryTestCaseRequest request) {
// 判断当前项目下是否有默认模块，没有添加默认模块
this.getDefaultNode(projectId);
List<TestCaseNodeDTO> testCaseNodes = extTestCaseNodeMapper.getNodeTreeByProjectId(projectId); List<TestCaseNodeDTO> testCaseNodes = extTestCaseNodeMapper.getNodeTreeByProjectId(projectId);
request.setUserId(SessionUtils.getUserId()); request.setUserId(SessionUtils.getUserId());
request.setProjectId(projectId); request.setProjectId(projectId);