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

* Fix bug #26723.

Browse Source
This commit is contained in:
liumengyi
2022-08-22 11:12:38 +08:00
parent e28e4e8981
commit 20041ea696
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+2 -2
View File
@@ -1868,7 +1868,7 @@ class bugModel extends model
->orderBy($orderBy)->page($pager)->fetchAll();
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
return $bugs;
}
@@ -1936,7 +1936,7 @@ class bugModel extends model
->fetchAll('id');
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
return $bugs;
}
module/common/model.php
-1
View File
@@ -2232,7 +2232,6 @@ EOD;
$queryCondition = explode(' ORDER BY ', $sql);
$queryCondition = $queryCondition[0];
}
$queryCondition = preg_replace('/((AND)|(OR)) *t2.\w+ * [^ ]+ [^ ]+/', '', $queryCondition);
$queryCondition = trim($queryCondition);
if(empty($queryCondition)) $queryCondition = "1=1";