From 19f499e1216d5836cda8f2d0b49627e8242d2ad9 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 13 Apr 2022 10:36:39 +0800
Subject: [PATCH] * Fix bug #17994.

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

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 0e791390bf..557624257f 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1424,18 +1424,16 @@ class testtask extends control
      * @param  int    $userID
      * @param  string $id
      * @param  string $status
-     * @param  int    $appendID
      * @access public
      * @return void
      */
-    public function ajaxGetUserTestTasks($userID = '', $id = '', $status = '', $appendID = 0)
+    public function ajaxGetUserTestTasks($userID = '', $id = '', $status = 'all')
     {
         if($userID == '') $userID = $this->app->user->id;
         $user    = $this->loadModel('user')->getById($userID, 'id');
         $account = $user->account;
 
-        $status    = empty($status) ? 'all' : $status;
-        $testTasks = $this->testtask->getUserTestTaskPairs($account, 0, $status, '', '', $appendID);
+        $testTasks = $this->testtask->getUserTestTaskPairs($account, 0, $status);
 
         if($id) return print(html::select("testtasks[$id]", $testTasks, '', 'class="form-control"'));
         return print(html::select('testtask', $testTasks, '', 'class="form-control"'));
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 00b3c6ccb1..59f251cad2 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1037,11 +1037,10 @@ class testtaskModel extends model
      * @param  string       $status all|wait|doing|done|blocked
      * @param  array        $skipProductIDList
      * @param  array        $skipExecutionIDList
-     * @param  int|array    $appendTestTaskID
      * @access public
      * @return array
      */
-    public function getUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipExecutionIDList = array(), $appendTestTaskID = 0)
+    public function getUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipExecutionIDList = array())
     {
         $stmt = $this->dao->select('t1.id, t1.name, t2.name as execution')
             ->from(TABLE_TESTTASK)->alias('t1')
@@ -1051,7 +1050,6 @@ class testtaskModel extends model
             ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
             ->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi()
             ->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi()
-            ->beginIF(!empty($appendTestTaskID))->orWhere('t1.id')->in($appendTestTaskID)->fi()
             ->beginIF($limit)->limit($limit)->fi()
             ->query();
 
diff --git a/module/todo/control.php b/module/todo/control.php
index 9d7919bd7d..cf6f386247 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -225,7 +225,7 @@ class todo extends control
                 $risks         = $this->loadmodel('risk')->getUserRiskPairs($account);
                 $opportunities = $this->loadmodel('opportunity')->getUserOpportunityPairs($account);
             }
-            $testtasks = $this->loadModel('testtask')->getUserTestTaskPairs($account, 0, 'all', '', '', isset($objectIDList['testtask']) ? $objectIDList['testtask'] : '');
+            $testtasks = $this->loadModel('testtask')->getUserTestTaskPairs($account);
 
             /* Judge whether the edited todos is too large. */
             $countInputVars  = count($editedTodos) * $columns;
diff --git a/module/todo/js/common.js b/module/todo/js/common.js
index dc71a10ae5..a5ed1f302a 100644
--- a/module/todo/js/common.js
+++ b/module/todo/js/common.js
@@ -31,7 +31,7 @@ function loadList(type, id, defaultType, idvalue)
 
     id = id ? id : '';
     var param = 'userID=' + userID + '&id=' + id;
-    if(type == "task" || type == "testtask") param += '&status=';
+    if(type == "task") param += '&status=';
     if(type == defaultType && idvalue != 0) param += '&idvalue=' + idvalue;
 
     if(moduleList.indexOf(type) !== -1)