Merge branch 'fixbug'

2022-11-16 13:08:00 +08:00
parent 29c32632c0 3ce0869e1a
commit 2bb3cd3371
1 changed files with 1 additions and 1 deletions
@@ -3082,7 +3082,7 @@ class storyModel extends model
        }
        elseif($branch !== 'all' and $branch !== '' and strpos($storyQuery, '`branch` =') === false and $queryProductID != 'all')
        {
-            $storyQuery .= " AND `branch` in($branch)";
+            if($branch and strpos($storyQuery, '`branch` =') === false) $storyQuery .= " AND `branch` " . helper::dbIN($branch);
        }
        $storyQuery = preg_replace("/`plan` +LIKE +'%([0-9]+)%'/i", "CONCAT(',', `plan`, ',') LIKE '%,$1,%'", $storyQuery);