From 71209416b2919b5d425e501ce3703bf0c96bf4b7 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 27 Jul 2020 15:20:45 +0800
Subject: [PATCH]  * Finish task #7554.

---
 module/testtask/control.php | 9 ++-------
 module/testtask/model.php   | 6 +++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 06e818a6a3..e252f9a5d9 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -861,13 +861,8 @@ class testtask extends control
         $this->loadModel('testcase');
         $this->config->testcase->search['params']['product']['values']= array($productID => $this->products[$productID]);
         $this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
-        $this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type&param=myQueryID");
-        $this->config->testcase->search['queryID']   = $param;
-        if($param)
-        {
-            $query = $this->loadModel('search')->getQuery($param);
-            if($query) $this->session->set('testcaseForm', $query->form);
-        }
+        $this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type&param=$param");
+        $this->config->testcase->search['style']     = 'simple';
         if($this->session->currentProductType == 'normal')
         {
             unset($this->config->testcase->search['fields']['branch']);
diff --git a/module/testtask/model.php b/module/testtask/model.php
index a3f63d5b5d..8b1daa4546 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -495,7 +495,7 @@ class testtaskModel extends model
         if($type == 'bystory') $cases = $this->getLinkableCasesByStory($productID, $task, $query, $linkedCases, $pager);
         if($type == 'bybug')   $cases = $this->getLinkableCasesByBug($productID, $task, $query, $linkedCases, $pager);
         if($type == 'bysuite') $cases = $this->getLinkableCasesBySuite($productID, $task, $query, $param, $linkedCases, $pager);
-        if($type == 'bybuild') $cases = $this->getLinkableCasesByTestTask($param, $linkedCases, $pager);
+        if($type == 'bybuild') $cases = $this->getLinkableCasesByTestTask($param, $linkedCases, $query, $pager);
 
         return $cases;
     }
@@ -624,11 +624,11 @@ class testtaskModel extends model
      * @access public
      * @return array
      */
-    public function getLinkableCasesByTestTask($testTask, $linkedCases, $pager)
+    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');
 
-        return $this->dao->select("*")->from(TABLE_CASE)->where('id')->in($caseList)->andWhere('status')->ne('wait')->page($pager)->fetchAll();
+        return $this->dao->select("*")->from(TABLE_CASE)->where($query)->andWhere('id')->in($caseList)->andWhere('status')->ne('wait')->page($pager)->fetchAll();
     }
 
     /**