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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liuchenglong
2023-05-08 05:09:31 +00:00
parent f76553af8e 8d1640b1be
commit 0b5245918f
91 changed files with 1540 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+2 -2
View File
@@ -873,7 +873,7 @@ class programplanModel extends model
$linkProducts = array();
$linkBranches = array();
$productList = $this->loadModel('product')->getProducts($projectID);
if($project->division)
if($project->stageBy == 'product')
{
$linkProducts = array(0 => $productID);
$linkBranches = array(0 => $productList[$productID]->branches);
@@ -954,7 +954,7 @@ class programplanModel extends model
{
unset($plan->id);
$plan->status = 'wait';
$plan->division = $project->division;
$plan->stageBy = $project->stageBy;
$plan->version = 1;
$plan->parentVersion = $plan->parent == 0 ? 0 : $this->dao->findByID($plan->parent)->from(TABLE_PROJECT)->fetch('version');
$plan->team = substr($plan->name,0, 30);