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

---
 module/task/control.php   |  3 +--
 module/testtask/model.php | 10 +++++-----
 module/todo/js/common.js  |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 0d30f54b71..0eb7caa486 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1649,13 +1649,12 @@ class task extends control
      * @access public
      * @return string
      */
-    public function ajaxGetUserTasks($userID = '', $id = '', $status = '', $appendID = 0)
+    public function ajaxGetUserTasks($userID = '', $id = '', $status = 'wait,doing', $appendID = 0)
     {
         if($userID == '') $userID = $this->app->user->id;
         $user    = $this->loadModel('user')->getById($userID, 'id');
         $account = $user->account;
 
-        $status         = empty($status) ? 'wait,doing' : $status;
         $tasks          = $this->task->getUserTaskPairs($account, $status, '', $appendID);
         $suspendedTasks = $this->task->getUserSuspendedTasks($account);
         foreach($tasks as $taskid => $task)
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 59f251cad2..e2ecc67318 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1032,11 +1032,11 @@ class testtaskModel extends model
     /**
      * Get testtask pairs of a user.
      *
-     * @param  string       $account
-     * @param  int          $limit
-     * @param  string       $status all|wait|doing|done|blocked
-     * @param  array        $skipProductIDList
-     * @param  array        $skipExecutionIDList
+     * @param  string $account
+     * @param  int    $limit
+     * @param  string status all|wait|doing|done|blocked
+     * @param  array  $skipProductIDList
+     * @param  array  $skipExecutionIDList
      * @access public
      * @return array
      */
diff --git a/module/todo/js/common.js b/module/todo/js/common.js
index a5ed1f302a..2c63c20f9d 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") param += '&status=';
+    if(type == "task") param += '&status=wait,doing';
     if(type == defaultType && idvalue != 0) param += '&idvalue=' + idvalue;
 
     if(moduleList.indexOf(type) !== -1)