From 094f8f5f607c9653ab23affdd8023a605dca7ca2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 18 Apr 2023 13:31:58 +0800 Subject: [PATCH] * Fix bug #33917. --- module/my/model.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module/my/model.php b/module/my/model.php index 0dff834758..646b61102e 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -511,6 +511,8 @@ class myModel extends model unset($this->config->execution->search['fields']['canceledBy']); unset($this->config->execution->search['fields']['closedDate']); unset($this->config->execution->search['fields']['canceledDate']); + unset($this->config->execution->search['params']['status']['values']['cancel']); + unset($this->config->execution->search['params']['status']['values']['closed']); } $projects = $this->loadModel('project')->getPairsByProgram(); @@ -598,7 +600,8 @@ class myModel extends model ->andWhere('(t2.status')->ne('suspended')->orWhere('t4.status')->ne('suspended')->markRight(1) ->beginIF($moduleName == 'workTask') ->beginIF(!empty($assignedToMatches))->andWhere("(t1.$assignedToCondition or (t1.mode = 'multi' and t5.`account` $operatorAndAccount and t1.status != 'closed' and t5.status != 'done') )")->fi() - ->beginIF(empty($assignedToMatches))->andWhere("t1.assignedTo")->eq($account)->fi() + ->beginIF(empty($assignedToMatches))->andWhere("(t1.assignedTo = '{$account}' or (t1.mode = 'multi' and t5.`account` = '{$account}' and t1.status != 'closed' and t5.status != 'done') )")->fi() + ->andWhere('t1.status')->notin('closed,cancel') ->fi() ->beginIF($moduleName == 'contributeTask') ->andWhere('t1.openedBy', 1)->eq($account)