diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiCaseController.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiCaseController.java index e27e0727f2..1b39bb4d61 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiCaseController.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiCaseController.java @@ -74,7 +74,7 @@ public class TestPlanApiCaseController { public Pager> page(@Validated @RequestBody TestPlanApiCaseRequest request) { Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), StringUtils.isNotBlank(request.getSortString("id")) ? request.getSortString("id") : "t.pos desc"); - return PageUtils.setPageInfo(page, testPlanApiCaseService.hasRelateApiCaseList(request, false)); + return PageUtils.setPageInfo(page, testPlanApiCaseService.hasRelateApiCaseList(request, false, SessionUtils.getCurrentProjectId())); } diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiScenarioController.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiScenarioController.java index 00f9486a3c..b8c9d03ad6 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiScenarioController.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanApiScenarioController.java @@ -63,7 +63,7 @@ public class TestPlanApiScenarioController { public Pager> page(@Validated @RequestBody TestPlanApiScenarioRequest request) { Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), StringUtils.isNotBlank(request.getSortString("id")) ? request.getSortString("id") : "test_plan_api_scenario.pos desc"); - return PageUtils.setPageInfo(page, testPlanApiScenarioService.hasRelateApiScenarioList(request, false)); + return PageUtils.setPageInfo(page, testPlanApiScenarioService.hasRelateApiScenarioList(request, false, SessionUtils.getCurrentProjectId())); } @PostMapping("/module/count") diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java index e638f9d5d9..bcb52a405f 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiCaseService.java @@ -244,13 +244,13 @@ public class TestPlanApiCaseService extends TestPlanResourceService { * @param deleted * @return */ - public List hasRelateApiCaseList(TestPlanApiCaseRequest request, boolean deleted) { + public List hasRelateApiCaseList(TestPlanApiCaseRequest request, boolean deleted, String currentProjectId) { filterCaseRequest(request); if (CollectionUtils.isEmpty(request.getProtocols())) { return new ArrayList<>(); } List list = extTestPlanApiCaseMapper.relateApiCaseList(request, deleted); - buildApiCaseResponse(list, request.getTestPlanId(), request.getProjectId()); + buildApiCaseResponse(list, request.getTestPlanId(), currentProjectId); return list; } diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java index 332ddb0071..c8440088aa 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanApiScenarioService.java @@ -386,10 +386,10 @@ public class TestPlanApiScenarioService extends TestPlanResourceService { * @param deleted * @return */ - public List hasRelateApiScenarioList(TestPlanApiScenarioRequest request, boolean deleted) { + public List hasRelateApiScenarioList(TestPlanApiScenarioRequest request, boolean deleted, String currentProjectId) { filterCaseRequest(request); List list = extTestPlanApiScenarioMapper.relateApiScenarioList(request, deleted); - buildApiScenarioResponse(list, request.getTestPlanId(), request.getProjectId()); + buildApiScenarioResponse(list, request.getTestPlanId(), currentProjectId); return list; }