Merge branch 'master_xieqiyu_30698' into 'master'

* Fix bug#30698. See merge request easycorp/zentaopms!6509
2022-12-09 06:49:32 +00:00
parent 8981507e80 4724af01bb
commit 1f1e87e9cc
1 changed files with 1 additions and 0 deletions
@@ -1030,6 +1030,7 @@ class productplan extends control
            $parentPlan     = $this->productplan->getByID($parentID);
            foreach(explode(',', $parentPlan->branch) as $parentBranchID)
            {
+                if(!isset($branchPairs[$parentBranchID])) continue;
                $parentBranches[$parentBranchID] = $branchPairs[$parentBranchID];
                if(!empty($currentBranches) and strpos(",$currentBranches,", ",$parentBranchID,") === false) $currentBranches = str_replace(",$parentBranchID,", ',', $currentBranches);
            }