* Finish task #8882,8884.

2021-01-01 09:54:34 +08:00
parent 40517fa1ec
commit cf613fdbac
14 changed files with 41 additions and 30 deletions
@@ -2073,7 +2073,6 @@ class taskModel extends model
            ->markRight(1)
            ->fi()
            ->beginIF($this->app->rawMethod == 'contribute')->andWhere("t1.status")->in('closed,done,cancel')->fi()
-            ->beginIF($this->app->rawMethod == 'work')->andWhere("t1.status")->in('wait,doing,pause')->fi()
            ->beginIF($type != 'all' and $type != 'finishedBy')->andWhere("t1.`$type`")->eq($account)->fi()
            ->orderBy($orderBy)
            ->beginIF($limit > 0)->limit($limit)->fi()