From 314f65c8660a820005f1b9db9f17291eeafc1938 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Fri, 19 Jul 2024 09:29:56 +0800
Subject: [PATCH] * [task#123273,doing,0.5h] fix drill result with filters.

---
 module/pivot/model.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/pivot/model.php b/module/pivot/model.php
index db1766e170..282cdbbfd6 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -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'];