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

* [task#127513,done,1h] Process filters.

Browse Source
This commit is contained in:
daitingting
2024-09-04 16:42:50 +08:00
committed by 綦新志
parent 7299738f21
commit 87f166aebe
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/model.php
+3 -2
View File
@@ -757,8 +757,9 @@ class chartModel extends model
if(!isset($filter['default'])) continue;
if(isset($filter['from']) and $filter['from'] == 'query')
{
$default = "'{$filter['default']}'";
$sql = str_replace('$' . $filter['field'] . 'Condition', $default, $sql);
$default = $filter['default'];
$relatedField = $filter['relatedField'];
$sql = str_replace('$' . $filter['field'] . 'Condition', "{$relatedField}='{$default}'", $sql);
}
}
}
module/pivot/model.php
+1 -1
View File
@@ -680,7 +680,7 @@ class pivotModel extends model
if(isset($filter['from']) && $filter['from'] == 'query')
{
$queryDefault = isset($filter['default']) ? $this->processDateVar($filter['default']) : '';
$sql = str_replace('$' . $filter['field'], "'{$queryDefault}'", $sql);
$sql = str_replace('$' . $filter['field'] . 'Condition', "{$filter['relatedField']}='{$queryDefault}'", $sql);
}
else
{