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

* fix bug for save query condition.

Browse Source
This commit is contained in:
wangyidong
2016-11-23 14:28:53 +08:00
parent 26aadd03f9
commit 66f4ab8ea6
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+12 -13
View File
@@ -1015,10 +1015,12 @@ class commonModel extends model
if($onlyCondition)
{
$queryCondition = explode('WHERE', $sql);
if(!isset($queryCondition[1])) return true;
$queryCondition = explode('ORDER', $queryCondition[1]);
$queryCondition = str_replace('t1.', '', $queryCondition[0]);
$queryCondition = isset($queryCondition[1]) ? $queryCondition[1] : '';
if($queryCondition)
{
$queryCondition = explode('ORDER', $queryCondition);
$queryCondition = str_replace('t1.', '', $queryCondition[0]);
}
}
else
{
@@ -1033,17 +1035,14 @@ class commonModel extends model
/* Set the query condition session. */
$orderBy = explode('ORDER BY', $sql);
if(isset($orderBy[1]))
$orderBy = isset($orderBy[1]) ? $orderBy[1] : '';
if($orderBy)
{
$orderBy = explode('limit', $orderBy[1]);
$orderBy = str_replace('t1.', '', $orderBy[0]);
$this->session->set($objectType . 'OrderBy', $orderBy);
}
else
{
$this->session->set($objectType . 'OrderBy', '');
$orderBy = explode('limit', $orderBy);
$orderBy = $orderBy[0];
if($onlyCondition) $orderBy = str_replace('t1.', '', $orderBy);
}
$this->session->set($objectType . 'OrderBy', $orderBy);
}
/**