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

Merge branch 'sprint/239_liuruogu_task_69600' into 'zentaopms_239'

Browse Source 
* Finish task #69600.

See merge request easycorp/zentaopms!5433
This commit is contained in:
刘刚
2022-09-20 09:17:15 +00:00
parent c8f31700f5 432ff3c8a2
commit 43e8fd4bca
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module/product/model.php
View File

@@ -360,10 +360,10 @@ class productModel extends model
* @param string $mode
* @param string $programID
* @param string|array $append
* @param number|bool $shadow
* @param bool $dealShadow: If it is true, the name of the shadow product will be displayed as the name of the project. If it is false, the shadow product will be hidden.
* @return array
*/
public function getPairs($mode = '', $programID = 0, $append = '', $shadow = false)
public function getPairs($mode = '', $programID = 0, $append = '', $dealShadow = false)
{
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs();
@@ -372,31 +372,39 @@ class productModel extends model
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
if($this->config->systemMode == 'new')
{
$select = 't1.*, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed';
if($dealShadow) $select = 't1.*, IF(t1.shadow = 1, t4.name, t1.name) AS name, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed';
/* Order by program. */
return $this->dao->select('t1.*, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed')->from(TABLE_PRODUCT)->alias('t1')
return $this->dao->select($select)->from(TABLE_PRODUCT)->alias('t1')
->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t3')->on('t1.id = t3.product')
->leftJoin(TABLE_PROJECT)->alias('t4')->on('t3.project = t4.id')
->where(1)
->beginIF(strpos($mode, 'all') === false)->andWhere('t1.deleted')->eq(0)->fi()
->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('t1.id')->in($views)->fi()
->beginIF(is_numeric($shadow))->andWHere('t1.shadow')->eq($shadow)->fi()
->beginIF(!$dealShadow)->andWhere('t1.shadow')->eq(0)->fi()
->andWhere('t1.vision')->eq($this->config->vision)
->orderBy('isClosed, t2.order_asc, t1.line_desc, t1.order_asc')
->fetchPairs('id', 'name');
}
else
{
$select = 't1.*, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed';
if($dealShadow) $select = 't1.*, IF(t1.shadow = 1, t3.name, t1.name) AS name, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed';
$orderBy = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
return $this->dao->select('*, IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
->from(TABLE_PRODUCT)
->from(TABLE_PRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.product')
->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project = t3.id')
->where(1)
->beginIF(strpos($mode, 'all') === false)->andWhere('deleted')->eq(0)->fi()
->beginIF($programID)->andWhere('program')->eq($programID)->fi()
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('id')->in($views)->fi()
->beginIF(is_numeric($shadow))->andWHere('t1.shadow')->eq($shadow)->fi()
->andWhere('vision')->eq($this->config->vision)
->beginIF(strpos($mode, 'all') === false)->andWhere('t1.deleted')->eq(0)->fi()
->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('t1.id')->in($views)->fi()
->beginIF(!$dealShadow)->andWhere('t1.shadow')->eq(0)->fi()
->andWhere('t1.vision')->eq($this->config->vision)
->orderBy($orderBy)
->fetchPairs('id', 'name');
}

3
module/tree/control.php
View File

@@ -102,7 +102,8 @@ class tree extends control
if($viewType == 'story')
{
/* Set menu.*/
$products = $this->product->getPairs($mode = '', $programID = 0, $append = '', $shadow = 0);
$lib = $this->product->getById($rootID);
$products = $this->product->getPairs($mode = '', $programID = 0, $append = '', !empty($lib->shadow));
$this->product->saveState($rootID, $products);
unset($products[$rootID]);