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

* [task#123273,doing,0.5h] fix drill result with filters.

Browse Source
This commit is contained in:
zhouxin
2024-07-19 09:45:53 +08:00
committed by 綦新志
parent 95f4d34b1c
commit 314f65c866
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+2 -3
View File
@@ -2607,8 +2607,7 @@ class pivotModel extends model
public function getDrillResult($object, $whereSQL, $filters, $conditions = '', $emptyFilters = true)
{
$drillSQL = $this->getDrillSQL($object, $whereSQL, $conditions);
$filterFormat = $this->getFilterFormat($drillSQL, $filters);
$sql = $this->loadModel('bi')->processVars($drillSQL, $filterFormat, $emptyFilters);
$sql = $this->loadModel('bi')->processVars($drillSQL, $filters, $emptyFilters);
$result = $this->execDrillSQL($object, $sql);
return $result;
@@ -2640,7 +2639,7 @@ class pivotModel extends model
$status = null;
if($pivotState->isQueryFilter())
{
$queryResult = $this->getDrillResult($drill->object, $drill->whereSql, $filters, $conditions);
$queryResult = $this->getDrillResult($drill->object, $drill->whereSql, $filters, $conditions, false);
$data = $queryResult['data'];
$status = $queryResult['status'];