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

* Fix bug #25483.

Browse Source
This commit is contained in:
tianshujie
2022-07-20 16:07:50 +08:00
parent c4ab5588af
commit 68eecb775e
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/program/model.php
View File

@@ -565,11 +565,6 @@ class programModel extends model
if($this->session->projectQuery == false) $this->session->set('projectQuery', ' 1 = 1');
}
if(isset($this->config->setCode) and $this->config->setCode == 0)
{
$this->session->projectQuery = preg_replace("/`code`.*' [)] (AND|OR) \( 1 AND `/", '1 ) $1 ( 1 AND `', $this->session->projectQuery);
}
$query = str_replace('`id`','t1.id', $this->session->projectQuery);
$projectList = $this->dao->select('distinct t1.*')->from(TABLE_PROJECT)->alias('t1')
->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')

2
module/project/config.php
View File

@@ -155,7 +155,7 @@ $config->project->search['fields']['lastEditedDate'] = $lang->project->lastEdite
$config->project->search['fields']['closedDate'] = $lang->project->closedDate;
$config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input' , 'values' => '');
if(!isset($config->setCode) or $config->setCode == 1) $config->project->search['params']['code'] = array('operator' => '=' , 'control' => 'input' , 'values' => '');
if(!isset($config->setCode) or $config->setCode == 1) $config->project->search['params']['code'] = array('operator' => '=', 'control' => 'input' , 'values' => '');
$config->project->search['params']['id'] = array('operator' => '=' , 'control' => 'input' , 'values' => '');
$config->project->search['params']['model'] = array('operator' => '=' , 'control' => 'select', 'values' => $lang->project->modelList);
$config->project->search['params']['parent'] = array('operator' => '=' , 'control' => 'select', 'values' => '');