From bcf7f2168994bfee289bbf17a65e83cc948a456e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 6 May 2021 11:03:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=84=91=E5=9B=BE=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E9=A1=BA=E5=BA=8F=E4=B8=8E=E5=88=97=E8=A1=A8=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml            |  1 +
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.xml    |  1 +
 .../metersphere/track/service/TestCaseService.java   |  1 +
 .../src/business/components/track/case/TestCase.vue  |  1 +
 .../track/case/components/TestCaseList.vue           |  1 +
 .../track/common/minder/TestCaseMinder.vue           | 12 ++++++------
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index de83132483..0cd2cabf1b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -418,6 +418,7 @@
         id, `name`, node_id, node_path, `type`, `method`, maintainer, priority, prerequisite, remark, steps
         from test_case
         <include refid="queryWhereCondition"/>
+        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
     <select id="getTestCaseByNotInIssue" resultType="io.metersphere.track.dto.TestCaseDTO">
         select
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 4b5731e16e..1991d37ffd 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -530,6 +530,7 @@
         <where>
             pc.plan_id = #{planId}
         </where>
+        order by pc.update_time desc;
     </select>
     <select id="listTestCaseTest" resultType="io.metersphere.track.dto.TestCaseTestDTO">
         select * from test_case_test where test_case_id = #{caseId};
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index c239e140cd..33baea3b91 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1001,6 +1001,7 @@ public class TestCaseService {
     }
 
     public List<TestCaseWithBLOBs> listTestCaseForMinder(QueryTestCaseRequest request) {
+        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         return extTestCaseMapper.listForMinder(request);
     }
 
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 33d2aca511..dc08614d9e 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -43,6 +43,7 @@
           <test-case-minder
             :tree-nodes="treeNodes"
             :project-id="projectId"
+            :condition="condition"
             v-if="activeDom === 'right'"
             ref="minder"/>
           </ms-tab-button>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 3b940bf119..570bc89dc5 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -396,6 +396,7 @@ export default {
       }
       if (this.projectId) {
         this.condition.projectId = this.projectId;
+        this.$emit('setCondition', this.condition);
         this.result = this.$post(this.buildPagePath('/test/case/list'), this.condition, response => {
           let data = response.data;
           this.total = data.itemCount;
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index eefa5f5097..88ea98c563 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -41,7 +41,7 @@ name: "TestCaseMinder",
       }
     },
     condition: Object,
-    projectId: String
+    projectId: String,
   },
   computed: {
     selectNodeIds() {
@@ -76,11 +76,11 @@ name: "TestCaseMinder",
   methods: {
     getTestCases() {
       if (this.projectId) {
-        let param = {
-          projectId: this.projectId,
-          nodeIds: this.selectNodeIds
-        }
-        this.result = this.$post('/test/case/list/minder', param,response => {
+        // let param = {
+        //   projectId: this.projectId,
+        //   nodeIds: this.selectNodeIds
+        // }
+        this.result = this.$post('/test/case/list/minder', this.condition,response => {
           this.testCase = response.data;
           this.dataMap = getTestCaseDataMap(this.testCase);
         });