From e33ffa6542e7b60eaea21f1ae4016f2020a09fab Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 24 Aug 2020 16:51:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml | 4 ++--
 .../java/io/metersphere/track/service/TestPlanService.java  | 6 ++++++
 .../report/TemplateComponent/DefectListComponent.vue        | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index c795f17d9f..8d0382ba42 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -7,7 +7,7 @@
           from test_case_issues, issues
          where test_case_issues.issues_id = issues.id
            and test_case_issues.test_case_id = #{caseId}
-           and issues.platform = #{platform};
-          order by test_case_issues.create_time DESC
+           and issues.platform = #{platform}
+          order by issues.create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 4dbf4c206a..163f6da004 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -272,8 +272,14 @@ public class TestPlanService {
                     i.setModel(testCase.getNodePath());
                     String des = i.getDescription().replaceAll("<p>", "").replaceAll("</p>", "");
                     i.setDescription(des);
+                    if (i.getLastmodify() == null || i.getLastmodify() == "") {
+                        if (i.getReporter() != null || i.getReporter() != "") {
+                            i.setLastmodify(i.getReporter());
+                        }
+                    }
                 }
                 issues.addAll(issue);
+                Collections.sort(issues, Comparator.comparing(Issues::getCreateTime, (t1, t2) -> t2.compareTo(t1)));
             }
 
             components.forEach(component -> {
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue
index 4370b7d0eb..14a74d201b 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue
@@ -32,7 +32,7 @@
                 show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-          prop="current_owner"
+          prop="lastmodify"
           :label="$t('test_track.module.current_owner')"
           show-overflow-tooltip>
         </el-table-column>