Merge branch 'sprint/231_dongli_64973' into 'master'

* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
This commit is contained in:
王怡栋
2022-08-24 01:14:44 +00:00
9 changed files with 84 additions and 12 deletions
+4 -3
View File
@@ -797,16 +797,17 @@ class projectModel extends model
/**
* Get project by id list.
*
* @param array $projectIdList
* @param array $projectIdList
* @param string $mode all
* @access public
* @return object
*/
public function getByIdList($projectIdList = array())
public function getByIdList($projectIdList = array(), $mode = '')
{
return $this->dao->select('*')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('id')->in($projectIdList)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->beginIF(!$this->app->user->admin and $mode != 'all')->andWhere('id')->in($this->app->user->view->projects)->fi()
->fetchAll('id');
}