Merge branch 'sprint/174_mayue_16605' into 'master'

Fix bug #16605. See merge request easycorp/zentaopms!616
2021-11-25 06:45:58 +00:00
parent bcc8081925 f92ba845a3
commit 293a375ec8
8 changed files with 18 additions and 16 deletions
@@ -1638,13 +1638,12 @@ class executionModel extends model
     *
     * @param  array  $products
     * @param  int    $projectID
-     * @param  string $status
     * @access public
     * @return array
     */
-    public function getBranchByProduct($products, $projectID = 0, $status = 'noclosed')
+    public function getBranchByProduct($products, $projectID = 0)
    {
-        $branchGroups = $this->loadModel('branch')->getByProducts($products, $status);
+        $branchGroups = $this->loadModel('branch')->getByProducts($products, 'noclosed');

        if($projectID)
        {