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

* Use the related project's name instead of the product's name if it's a shadow product.

Browse Source
This commit is contained in:
liugang
2022-09-20 15:37:52 +08:00
parent 6e47d6c8ca
commit 39d330e45b
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -1143,7 +1143,7 @@ class product extends control
$programProducts = array();
$products = $this->app->tab == 'project' ? $this->product->getProducts($this->session->project) : $this->product->getList();
$products = $this->app->tab == 'project' ? $this->product->getProducts($this->session->project) : $this->product->getList(0, 'all', 0, 0, 'all');
foreach($products as $product) $programProducts[$product->program][] = $product;
module/product/model.php
+21 -1
View File
@@ -264,7 +264,7 @@ class productModel extends model
*/
public function getList($programID = 0, $status = 'all', $limit = 0, $line = 0, $type = 'normal')
{
return $this->dao->select('t1.*')->from(TABLE_PRODUCT)->alias('t1')
$products = $this->dao->select('t1.*')->from(TABLE_PRODUCT)->alias('t1')
->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
->where('t1.deleted')->eq(0)
->beginIF($type == 'normal')->andWhere('t1.shadow')->eq(0)->fi()
@@ -289,6 +289,26 @@ class productModel extends model
->orderBy('t2.order_asc, t1.line_desc, t1.order_asc')
->beginIF($limit > 0)->limit($limit)->fi()
->fetchAll('id');
if($type == 'all')
{
$shadowProducts = array();
foreach($products as $product)
{
if($product->shadow) $shadowProducts[] = $product->id;
}
if($shadowProducts)
{
$shadowProducts = $this->dao->select('t1.id,t3.name')->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('t1.id')->in($shadowProducts)
->fetchPairs();
foreach($shadowProducts as $id => $name) $products[$id]->name = $name;
}
}
return $products;
}
/**