Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'fixbug/liumengyi_33917' into 'master'

Browse Source 
* Fix bug #33917.

See merge request easycorp/zentaopms!7452
This commit is contained in:
王怡栋
2023-04-18 05:50:39 +00:00
parent 70a1625a13 094f8f5f60
commit f79c5063a4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/model.php
+4 -1
View File
@@ -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)