Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source 
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
This commit is contained in:
孙广明
2021-11-29 06:58:17 +00:00
parent ae346dd200 78134ccb9b
commit 5ad303eca9
7 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/model.php
View File

@@ -2499,7 +2499,7 @@ class bugModel extends model
}
$allBranch = "`branch` = 'all'";
if($branch !== 'all' and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('$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);
$allProject = "`project` = 'all'";