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

Merge branch release/21.7.7 of zentao/zentaopms (#12430)

Browse Source
This commit is contained in:
朱金勇
2025-11-20 11:20:16 +08:00
committed by Gitfox
parent 971d12c811 21788de569
commit cfe76a718b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+2 -2
View File
@@ -1989,7 +1989,7 @@ class projectModel extends model
if(!empty($_POST['otherProducts'])) return $this->linkOtherProducts($projectID, $members);
/* Link products of current program of the project. */
$products = isset($_POST['products']) ? toIntArray($_POST['products']) : $products;
$products = isset($_POST['products']) ? (array)$_POST['products'] : $products;
$oldProjectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchGroup('product', 'branch');
$this->linkProducts($projectID, $products, $oldProjectProducts, $members);
@@ -1997,7 +1997,7 @@ class projectModel extends model
if($projectID > 0)
{
$executions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->fetchPairs('id');
$this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->in($executions)->andWhere('product')->notin($products)->exec();
$this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->in($executions)->andWhere('product')->notin(toIntArray($products))->exec();
if(isset($_POST['stageBy']) and $_POST['stageBy'] == 'product')
{