Merge branch 'sprint/renying_Fixbug#19044' into 'master'

Fixbug#19044 See merge request easycorp/zentaopms!3137
2022-04-26 08:10:42 +00:00
parent fe221fec43 df378ff26f
commit e1d6bf1ef2
1 changed files with 1 additions and 1 deletions
@@ -2690,7 +2690,7 @@ class storyModel extends model
        {
            $storyQuery = str_replace($allBranch, '1', $storyQuery);
        }
-        elseif($branch !== 'all')
+        elseif($branch !== 'all' and $queryProductID != 'all')
        {
            if($branch and strpos($storyQuery, '`branch` =') === false) $storyQuery .= " AND `branch` in($branch)";
        }