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

Merge branch 'sprint/183_tianshujie_18838' into 'master'

Browse Source 
* Fix bug #18838.

See merge request easycorp/zentaopms!1591
This commit is contained in:
孙广明
2022-01-25 03:20:31 +00:00
parent df75841d5b 7001f6c2d5
commit 2ec4e43353
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/execution/control.php
View File

@@ -2043,7 +2043,7 @@ class execution extends control
if($branches) $branchID = key($branches);
}
$plans = $this->execution->getPlans($products);
$plans = $this->execution->getPlans($products, 'skipParent', $executionID);
$allPlans = array('' => '');
if(!empty($plans))
{

5
module/execution/model.php
View File

@@ -3735,15 +3735,16 @@ class executionModel extends model
*
* @param int|array $productID
* @param string $param withMainPlan|skipParent
* @param int $executionID
* @return mixed
*/
public function getPlans($products, $param = '')
public function getPlans($products, $param = '', $executionID = 0)
{
$this->loadModel('productplan');
$param = strtolower($param);
$branchIDList = strpos($param, 'withmainplan') !== false ? array(BRANCH_MAIN => BRANCH_MAIN) : array();
$branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noclosed');
$branchGroups = $this->getBranchByProduct(array_keys($products), $executionID, 'noclosed');
foreach($branchGroups as $branches)
{
foreach($branches as $branchID => $branchName) $branchIDList[$branchID] = $branchID;