From fc2e4652bd4793f8799a1fd09f3c2124751a1128 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 25 Apr 2022 14:41:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E4=B8=AD=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=BA=8E=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1011633 --user=宋天阳 【测试跟踪】-测试报告中功能用例ID顺序和测试计划功能用例顺序不一致
https://www.tapd.cn/55049933/s/1146638
---
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.xml      |  2 +-
 .../track/case/components/TestCaseEditOtherInfo.vue    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

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 672e65c0e4..61d6c4f39a 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
@@ -502,7 +502,7 @@
             and tptc.status = 'Failure'
         </if>
         and (tc.status != 'Trash' or tc.status is null)
-        where tptc.plan_id = #{planId} order by tptc.update_time desc
+        where tptc.plan_id = #{planId} order by tptc.`order` desc
     </select>
     <update id="updateTestCaseStates" parameterType="java.lang.String">
         update test_plan_test_case
diff --git a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
index 9c1291019b..74c96625b2 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
@@ -74,10 +74,11 @@
       </el-row>
     </el-tab-pane>
     <el-tab-pane v-if="type!=='add'" :label="$t('test_track.review.comment')" name="comment">
-      <el-tooltip class="item-tabs" effect="dark" :content="$t('test_track.review.comment')" placement="top-start" slot="label">
+      <el-tooltip class="item-tabs" effect="dark" :content="$t('test_track.review.comment')" placement="top-start"
+                  slot="label">
               <span>
                 {{ $t('test_track.review.comment') }}
-                <div class="el-step__icon is-text ms-api-col ms-header" v-if="comments.length>0">
+                <div class="el-step__icon is-text ms-api-col ms-header" v-if="comments && comments.length>0">
                   <div class="el-step__icon-inner">{{ comments.length }}</div>
                 </div>
               </span>
@@ -93,7 +94,7 @@
                                :key="index"
                                :comment="comment"
                                @refresh="getComments" api-url="/test/case"/>
-          <div v-if="comments.length === 0" style="text-align: center">
+          <div v-if="!comments || comments.length === 0" style="text-align: center">
             <i class="el-icon-chat-line-square" style="font-size: 15px;color: #8a8b8d;">
                             <span style="font-size: 15px; color: #8a8b8d;">
                               {{ $t('test_track.comment.no_comment') }}
@@ -393,7 +394,8 @@ export default {
 .el-cascader >>> .el-input {
   cursor: pointer;
 }
-.ms-header{
+
+.ms-header {
   background: #783887;
   color: white;
   height: 18px;