Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport

This commit is contained in:
tanghucheng
2022-07-22 14:18:04 +08:00
14 changed files with 287 additions and 216 deletions
+1 -1
View File
@@ -108,7 +108,7 @@ class bug extends control
/* Set browse type. */
$browseType = strtolower($browseType);
if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
if($this->cookie->preProductID != $productID or ($this->cookie->preBranch != $branch and $product->type != 'normal' and $branch != 'all') or $browseType == 'bybranch')
{
$_COOKIE['bugModule'] = 0;
setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);