From 87f166aebe801ebc3489236d15dcd6518f6191c3 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 4 Sep 2024 08:32:39 +0000
Subject: [PATCH]  * [task#127513,done,1h] Process filters.

---
 module/chart/model.php | 5 +++--
 module/pivot/model.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/chart/model.php b/module/chart/model.php
index 9e06014f02..75ee6d25a5 100644
--- a/module/chart/model.php
+++ b/module/chart/model.php
@@ -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);
                 }
             }
         }
diff --git a/module/pivot/model.php b/module/pivot/model.php
index 0d2c520432..3669fcd7a5 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -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
             {