From 031134ae3f33fde876e4c28ab41d92b6fd631d58 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 8 Dec 2020 10:41:56 +0800
Subject: [PATCH] * Fix bug 3642.

---
 module/testtask/model.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index fcd95c5206..0e7dd6ac52 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -627,9 +627,16 @@ class testtaskModel extends model
      */
     public function getLinkableCasesByTestTask($testTask, $linkedCases, $query, $pager)
     {
-        $caseList  = $this->dao->select("`case`")->from(TABLE_TESTRUN)->where('task')->eq($testTask)->andWhere('`case`')->notin($linkedCases)->fetchPairs('case');
+        $query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
 
-        return $this->dao->select("*")->from(TABLE_CASE)->where($query)->andWhere('id')->in($caseList)->andWhere('status')->ne('wait')->page($pager)->fetchAll();
+        return $this->dao->select("t1.*,t2.lastRunner,t2.lastRunDate,t2.lastRunResult")->from(TABLE_CASE)->alias('t1')
+            ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case')
+            ->where($query)
+            ->andWhere('t1.id')->notin($linkedCases)
+            ->andWhere('t2.task')->eq($testTask)
+            ->andWhere('t1.status')->ne('wait')
+            ->page($pager)
+            ->fetchAll();
     }
 
     /**