* Fix projectlist.

This commit is contained in:
tanghucheng
2022-01-25 16:27:13 +08:00
parent ca32fb848f
commit 1f81f7cef8
2 changed files with 2 additions and 2 deletions

View File

@@ -448,8 +448,7 @@ class programModel extends model
->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
->leftJoin(TABLE_STAKEHOLDER)->alias('t3')->on('t1.id=t3.objectID')
->where('t1.deleted')->eq('0')
->beginIF($this->config->vision == 'lite')->andWhere('t1.vision')->eq('lite')->fi()
->beginIF($this->config->vision == 'common')->andWhere('t1.vision')->eq('common')->fi()
->andWhere('t1.vision')->eq($this->config->vision)
->beginIF($this->config->systemMode == 'new')->andWhere('t1.type')->eq('project')->fi()
->beginIF($this->config->systemMode == 'new' and ($this->cookie->involved or $involved))->andWhere('t2.type')->eq('project')->fi()
->beginIF($browseType != 'all' and $browseType != 'undone')->andWhere('t1.status')->eq($browseType)->fi()

View File

@@ -260,6 +260,7 @@ class projectModel extends model
$queryType = strtolower($queryType);
$projects = $this->dao->select('*')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('vision')->eq($this->config->vision)
->andWhere('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF($queryType == 'bystatus' and $param == 'undone')->andWhere('status')->notIN('done,closed')->fi()