From 1f81f7cef831c1a04ac12aa3af566bffa34b801b Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 25 Jan 2022 16:27:13 +0800 Subject: [PATCH] * Fix projectlist. --- module/program/model.php | 3 +-- module/project/model.php | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/program/model.php b/module/program/model.php index fcbf3ffac2..c7491dafbb 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -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() diff --git a/module/project/model.php b/module/project/model.php index 570d737b83..73debb0fd4 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -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()