diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java index 79a6865d71..fc5fd344ee 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiReportServiceImpl.java @@ -42,8 +42,6 @@ public class CleanupApiReportServiceImpl implements BaseCleanUpReport { private ApiScenarioReportDetailBlobMapper apiScenarioReportDetailBlobMapper; @Resource private ApiReportRelateTaskMapper apiReportRelateTaskMapper; - @Resource - private ExtApiReportRelateTaskMapper extApiReportRelateTaskMapper; @Override public void cleanReport(Map map, String projectId) { diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java index 128c6c1512..870540832c 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/controller/TestPlanReportController.java @@ -183,7 +183,7 @@ public class TestPlanReportController { // 不分页仅排序 {测试集升序, 用例位次倒序} page.setPageSize(0); page.setPageSizeZero(true); - page.setOrderBy("tpc.pos, tprfc.pos desc"); + page.setOrderBy("tpc.pos, tpc.name, tprfc.pos desc"); page.setOrderByOnly(true); } return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.FUNCTIONAL)); @@ -207,7 +207,7 @@ public class TestPlanReportController { // 不分页仅排序 {测试集升序, 用例位次倒序} page.setPageSize(0); page.setPageSizeZero(true); - page.setOrderBy("tpc.pos, tprac.pos desc"); + page.setOrderBy("tpc.pos, tpc.name, tprac.pos desc"); page.setOrderByOnly(true); } return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_CASE)); @@ -224,7 +224,7 @@ public class TestPlanReportController { // 不分页仅排序 {测试集升序, 用例位次倒序} page.setPageSize(0); page.setPageSizeZero(true); - page.setOrderBy("tpc.pos, tpras.pos desc"); + page.setOrderBy("tpc.pos, tpc.name, tpras.pos desc"); page.setOrderByOnly(true); } return PageUtils.setPageInfo(page, testPlanReportService.listReportDetailCases(request, AssociateCaseType.API_SCENARIO));