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

* Finish task #71568.

Browse Source
This commit is contained in:
daitingting
2022-10-19 03:01:18 +00:00
parent b3d6998ed8
commit 6948b02a8c
9 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+3 -5
View File
@@ -76,16 +76,15 @@ class programModel extends model
if($programID)
{
$program = $this->getByID($programID);
$path = explode(',', $program->path);
$path = array_filter($path);
$path = array_filter(explode(',', $program->path));
$programID = current($path);
}
/* When mode equals assign and programID equals 0, you can query the standalone product. */
if(!empty($append) and is_array($append)) $append = implode(',', $append);
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
$products = $this->dao->select('*')->from(TABLE_PRODUCT)
return $this->dao->select('*')->from(TABLE_PRODUCT)
->where('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->beginIF($shadow !== 'all')->andWhere('shadow')->eq((int)$shadow)->fi()
@@ -93,7 +92,6 @@ class programModel extends model
->beginIF(strpos($status, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($views)->fi()
->fetchPairs('id', 'name');
return $products;
}
/**