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

* Finish task #71598, #71599,#71600.

Browse Source
This commit is contained in:
daitingting
2022-10-11 09:07:57 +00:00
parent f6e2d7d272
commit 70b252f97c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+6 -5
View File
@@ -844,18 +844,19 @@ class projectModel extends model
* Get project pairs by id list.
*
* @param array $projectIdList
* @param string $mode
* @param string $model
* @access public
* @return array
*/
public function getPairsByIdList($projectIdList = array(), $mode = '')
public function getPairsByIdList($projectIdList = array(), $model = '', $param = '')
{
return $this->dao->select('id, name')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
->beginIF($projectIdList)->andWhere('id')->in($projectIdList)->fi()
->beginIF(!$this->app->user->admin and $mode != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF($mode != 'all' and !empty($mode))->andWhere('model')->in($mode)->fi()
->beginIF(!$this->app->user->admin and $model != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF($model != 'all' and !empty($model))->andWhere('model')->in($model)->fi()
->beginIF(strpos($param, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
->fetchPairs('id', 'name');
}
@@ -1030,7 +1031,7 @@ class projectModel extends model
->beginIF($this->config->vision)->andWhere('vision')->eq($this->config->vision)->fi()
->beginIF($model != 'all')->andWhere('model')->eq($model)->fi()
->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(strpos($param, 'nomultiple') !== false)->andWhere('multiple')->eq('1')->fi()
->beginIF(strpos($param, 'multiple') !== false)->andWhere('multiple')->eq('1')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!empty($append))->orWhere('id')->in($append)->fi()
->orderBy($orderBy)