From 6422b24d963ac11e16a6d5ef5d28e8ab874f0e90 Mon Sep 17 00:00:00 2001 From: liuyongkai Date: Sat, 8 Oct 2022 01:40:04 +0000 Subject: [PATCH] * Resolve feedback #938. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 5b1d540cf7..dcf2cb00df 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2615,7 +2615,7 @@ class taskModel extends model ->fi() ->beginIF($type == 'assignedTo' and ($this->app->rawModule == 'my' or $this->app->rawModule == 'block'))->andWhere('t2.status', true)->ne('suspended')->orWhere('t4.status')->ne('suspended')->markRight(1)->fi() ->beginIF($type != 'all' and $type != 'finishedBy' and $type != 'assignedTo')->andWhere("t1.`$type`")->eq($account)->fi() - ->beginIF($type == 'assignedTo')->andWhere("(t1.assignedTo = '{$account}' or (t1.mode = 'multi' and t5.`account` = '{$account}') )")->fi() + ->beginIF($type == 'assignedTo')->andWhere("(t1.assignedTo = '{$account}' or (t1.mode = 'multi' and t5.`account` = '{$account}' and t1.status != 'closed') )")->fi() ->beginIF($type == 'assignedTo' and $this->app->rawModule == 'my' and $this->app->rawMethod == 'work')->andWhere('t1.status')->notin('closed,cancel,pause')->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi()