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

* Fix bug #43251.

Browse Source
This commit is contained in:
wangyidong
2024-01-10 14:31:13 +08:00
parent 18def007be
commit 1bb702aa2a
8 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+6 -2
View File
@@ -230,10 +230,12 @@ class programModel extends model
*
* @param string $orderBy
* @param int $queryID
* @param bool $hasProject
* @param object $pager
* @access public
* @return array
*/
public function getListBySearch(string $orderBy = 'id_asc', int $queryID = 0): array
public function getListBySearch(string $orderBy = 'id_asc', int $queryID = 0, bool $hasProject = false, object|null $pager = null): array
{
if($this->session->programQuery == false) $this->session->set('programQuery', ' 1 = 1');
if($queryID)
@@ -268,10 +270,12 @@ class programModel extends model
return $this->dao->select('*')->from(TABLE_PROGRAM)->where('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->andWhere('type')->eq('program')
->beginIF(!$hasProject)->andWhere('type')->eq('program')->fi()
->beginIF($hasProject)->andWhere('type')->in('program,project')->fi()
->beginIF($query)->andWhere($query)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($objectIdList)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
}