From 38f03b78250cc229fb13047ef114a82cc887bef4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 9 Nov 2023 09:48:24 +0800
Subject: [PATCH] * Fix bug #40387.

---
 module/common/model.php    | 2 +-
 module/execution/model.php | 4 ++--
 module/task/model.php      | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 3e56e1d408..0294d5b870 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2174,7 +2174,7 @@ EOF;
      * @access public
      * @return void
      */
-    public function saveQueryCondition($sql, $objectType, $onlyCondition = '1=1')
+    public function saveQueryCondition($sql, $objectType, $onlyCondition = true)
     {
         /* Set the query condition session. */
         if($onlyCondition)
diff --git a/module/execution/model.php b/module/execution/model.php
index fcc8edf022..2f176fbd1a 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2000,7 +2000,7 @@ class executionModel extends model
             $executionQuery = "`execution` " . helper::dbIN(array_keys($executions));
             $taskQuery      = str_replace("`execution` = 'all'", $executionQuery, $taskQuery); // Search all execution.
             $this->session->set('taskQueryCondition', $taskQuery, $this->app->tab);
-            $this->session->set('taskOnlyCondition', '1=1', $this->app->tab);
+            $this->session->set('taskOnlyCondition', true, $this->app->tab);
 
             return $this->getSearchTasks($taskQuery, $sort, $pager);
         }
@@ -3660,7 +3660,7 @@ class executionModel extends model
              ->orderBy($orderBy)
              ->fetchAll('id');
 
-        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', '1=1');
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', true);
 
         return $this->processTasks($tasks);
     }
diff --git a/module/task/model.php b/module/task/model.php
index 66d031ef8e..e5c2fa8181 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1647,8 +1647,7 @@ class taskModel extends model
         $tasks = array();
         if($this->session->taskOnlyCondition)
         {
-            if($this->session->taskOnlyCondition == true) $this->session->taskOnlyCondition = '1=1';
-            $tasks = $this->dao->select('*')->from(TABLE_TASK)->alias('t1')->where($this->session->taskOnlyCondition)
+            $tasks = $this->dao->select('*')->from(TABLE_TASK)->alias('t1')->where($this->session->taskQueryCondition)
                 ->beginIF($this->post->exportType == 'selected')->andWhere('t1.id')->in($this->cookie->checkedItem)->fi()
                 ->orderBy($sort)
                 ->fetchAll('id');