From 02bee27596262b366c1d07d02a9e0c86292a6847 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 24 May 2022 10:11:08 +0800
Subject: [PATCH 1/3] * Finish story #14741.

---
 module/testcase/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testcase/config.php b/module/testcase/config.php
index 74c780eb55..2cdaa09d10 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -20,7 +20,7 @@ $config->testcase->export->listFields   = array('type', 'stage', 'pri', 'status'
 $config->testcase->exportFields = '
     id, product, branch, module, story,
     title, precondition, stepDesc, stepExpect, real, keywords,
-    pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunResult, openedBy, openedDate,
+    pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunner, lastRunDate, lastRunResult, openedBy, openedDate,
     lastEditedBy, lastEditedDate, version, linkCase, files';
 
 $config->testcase->customCreateFields      = 'story,stage,pri,keywords';

From e9bf958a3cad266cd8ef5406e979dd3ac19d1fd5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 24 May 2022 13:28:16 +0800
Subject: [PATCH 2/3] * Finish task #55253.

---
 module/testcase/control.php | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 2071f20d2e..a405f7452a 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1453,23 +1453,15 @@ class testcase extends control
             /* Get cases. */
             if($this->session->testcaseOnlyCondition)
             {
-                if($taskID)
-                {
-                    $caseIDList = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->fetchPairs();
-                    $cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)->andWhere('id')->in($caseIDList)
-                        ->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
-                        ->orderBy($orderBy)
-                        ->beginIF($this->post->limit)->limit($this->post->limit)->fi()
-                        ->fetchAll('id');
-                }
-                else
-                {
-                    $cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)
-                        ->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
-                        ->orderBy($orderBy)
-                        ->beginIF($this->post->limit)->limit($this->post->limit)->fi()
-                        ->fetchAll('id');
-                }
+                $caseIDList = array();
+                if($taskID) $caseIDList = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->fetchPairs();
+
+                $cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)
+                    ->beginIF(!empty($caseIDList))->andWhere('id')->in($caseIDList)->fi()
+                    ->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
+                    ->orderBy($orderBy)
+                    ->beginIF($this->post->limit)->limit($this->post->limit)->fi()
+                    ->fetchAll('id');
             }
             else
             {
@@ -1588,6 +1580,7 @@ class testcase extends control
                 if(isset($caseLang->statusList[$case->status]))        $case->status        = $this->processStatus('testcase', $case);
                 if(isset($users[$case->openedBy]))                     $case->openedBy      = $users[$case->openedBy];
                 if(isset($users[$case->lastEditedBy]))                 $case->lastEditedBy  = $users[$case->lastEditedBy];
+                if(isset($users[$case->lastRunner]))                   $case->lastRunner    = $users[$case->lastRunner];
                 if(isset($caseLang->resultList[$case->lastRunResult])) $case->lastRunResult = $caseLang->resultList[$case->lastRunResult];
 
                 $case->bugsAB       = $case->bugs;       unset($case->bugs);

From 63b5d64dc88c97788ebb6b814d60e1e97773d4ec Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 24 May 2022 13:38:11 +0800
Subject: [PATCH 3/3] * Finish task #14741.

---
 module/testcase/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index a405f7452a..25fb14ae7c 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1457,7 +1457,7 @@ class testcase extends control
                 if($taskID) $caseIDList = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->fetchPairs();
 
                 $cases = $this->dao->select('*')->from(TABLE_CASE)->where($this->session->testcaseQueryCondition)
-                    ->beginIF(!empty($caseIDList))->andWhere('id')->in($caseIDList)->fi()
+                    ->beginIF($taskID)->andWhere('id')->in($caseIDList)->fi()
                     ->beginIF($this->post->exportType == 'selected')->andWhere('id')->in($this->cookie->checkedItem)->fi()
                     ->orderBy($orderBy)
                     ->beginIF($this->post->limit)->limit($this->post->limit)->fi()