From 549a677a873fdce03e47e7b2764f8219e9f0ec4a Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 26 Nov 2019 15:05:41 +0800
Subject: [PATCH] * Finish task #6588.

---
 module/testtask/control.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 0f7e357c59..ee91c0b34c 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -942,6 +942,7 @@ class testtask extends control
         }
 
         $cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id');
+
         /* If case has changed and not confirmed, remove it. */
         if($from == 'testtask')
         {    
@@ -951,18 +952,14 @@ class testtask extends control
                 ->fetchPairs();
             foreach($cases as $caseID => $case)
             {
-                if(isset($runs[$caseID]) && $runs[$caseID] < $case->version) 
-                {
-                    unset($cases[$caseID]);
-                    $key = array_search($caseID, $caseIDList);
-                    if($key !== false) array_splice($caseIDList, $key, 1);
-                }
+                if(isset($runs[$caseID]) && $runs[$caseID] < $case->version) unset($cases[$caseID]);
             }
         }
+
         $this->view->cases = $cases;
         $this->view->steps = $this->dao->select('t1.*')->from(TABLE_CASESTEP)->alias('t1')
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
-            ->where('t2.id')->in($caseIDList)
+            ->where('t2.id')->in(array_keys($cases))
             ->andWhere('t1.version=t2.version')
             ->andWhere('t2.status')->ne('wait')
             ->fetchGroup('case', 'id');