Merge branch 'master_liuhong_78696' into 'master'

Master liuhong 78696 See merge request easycorp/zentaopms!6471
2022-12-07 01:33:32 +00:00
parent d3925a1ce4 a3893c9046
commit 1ea5ad8245
1 changed files with 2 additions and 0 deletions
@@ -3023,6 +3023,8 @@ class bugModel extends model
        }

        $allBranch = "`branch` = 'all'";
+        $branch    = trim($branch, ',');
+        if(strpos($branch, ',') !== false) $branch = str_replace(',', "','", $branch);
        if($branch !== 'all' and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
        if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);