From fcc7fbb9a18f68bb0d353aa869f4c0c04cb33c43 Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Fri, 6 Sep 2024 14:07:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=82=B9=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1046140 --user=王旭 【测试计划】测试规划修改测试点的顺序，没有生效 https://www.tapd.cn/55049933/s/1575480 --- .../java/io/metersphere/plan/service/TestPlanApiCaseService.java | 1 + .../io/metersphere/plan/service/TestPlanApiScenarioService.java | 1 + .../metersphere/plan/service/TestPlanFunctionalCaseService.java | 1 + 3 files changed, 3 insertions(+) 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 bcb52a405f..5bf653e8ce 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 @@ -463,6 +463,7 @@ public class TestPlanApiCaseService extends TestPlanResourceService { List returnList = new ArrayList<>(); TestPlanCollectionExample collectionExample = new TestPlanCollectionExample(); collectionExample.createCriteria().andTypeEqualTo(CaseType.API_CASE.getKey()).andParentIdNotEqualTo(ModuleConstants.ROOT_NODE_PARENT_ID).andTestPlanIdEqualTo(testPlanId); + collectionExample.setOrderByClause("pos asc"); List testPlanCollections = testPlanCollectionMapper.selectByExample(collectionExample); testPlanCollections.forEach(item -> { BaseTreeNode baseTreeNode = new BaseTreeNode(item.getId(), Translator.get(item.getName(), item.getName()), CaseType.API_CASE.getKey()); 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 c8440088aa..5999862eb1 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 @@ -604,6 +604,7 @@ public class TestPlanApiScenarioService extends TestPlanResourceService { List returnList = new ArrayList<>(); TestPlanCollectionExample collectionExample = new TestPlanCollectionExample(); collectionExample.createCriteria().andTypeEqualTo(CaseType.SCENARIO_CASE.getKey()).andParentIdNotEqualTo(ModuleConstants.ROOT_NODE_PARENT_ID).andTestPlanIdEqualTo(testPlanId); + collectionExample.setOrderByClause("pos asc"); List testPlanCollections = testPlanCollectionMapper.selectByExample(collectionExample); testPlanCollections.forEach(item -> { BaseTreeNode baseTreeNode = new BaseTreeNode(item.getId(), Translator.get(item.getName(), item.getName()), CaseType.SCENARIO_CASE.getKey()); diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java index 21f97c349d..16d796a23d 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanFunctionalCaseService.java @@ -312,6 +312,7 @@ public class TestPlanFunctionalCaseService extends TestPlanResourceService { List returnList = new ArrayList<>(); TestPlanCollectionExample collectionExample = new TestPlanCollectionExample(); collectionExample.createCriteria().andTypeEqualTo(CaseType.FUNCTIONAL_CASE.getKey()).andParentIdNotEqualTo(ModuleConstants.ROOT_NODE_PARENT_ID).andTestPlanIdEqualTo(testPlanId); + collectionExample.setOrderByClause("pos asc"); List testPlanCollections = testPlanCollectionMapper.selectByExample(collectionExample); testPlanCollections.forEach(item -> { BaseTreeNode baseTreeNode = new BaseTreeNode(item.getId(), Translator.get(item.getName(), item.getName()), CaseType.FUNCTIONAL_CASE.getKey());