From 44e8c537824d67241663dc620405908fe13049f1 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@chandao.com>
Date: Thu, 9 Oct 2025 08:50:57 +0800
Subject: [PATCH] * Optimize code.

---
 module/testreport/zen.php | 4 ++--
 module/testtask/model.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/testreport/zen.php b/module/testreport/zen.php
index a429ca99c4..c9ac346de2 100644
--- a/module/testreport/zen.php
+++ b/module/testreport/zen.php
@@ -347,8 +347,8 @@ class testreportZen extends testreport
      * 为创建查看测试报告数据构建报告数据。
      * Build testreport data for view.
      *
-     * @param  object    $report
-     * @access protected
+     * @param  object $report
+     * @access public
      * @return array
      */
     public function buildReportDataForView(object $report): array
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 272d51f692..a9bf741ff1 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1192,7 +1192,7 @@ class testtaskModel extends model
             $allProduct     = "`product` = 'all'";
             $caseQuery      = $this->session->testtaskQuery;
             $isQueryProduct = strpos($caseQuery, "`product` = '");
-            if($isQueryProduct !== false) $caseQuery = str_replace($allProduct, '1', $caseQuery) . ' AND `product` ' . helper::dbIN($this->app->user->view->products);
+            if(strpos($caseQuery, $allProduct) !== false) $caseQuery = str_replace($allProduct, '1', $caseQuery) . ' AND `product` ' . helper::dbIN($this->app->user->view->products);
             $caseQuery = preg_replace('/`(\w+)`/', 't2.`$1`', $caseQuery);
             $caseQuery = str_replace(array('t2.`assignedTo`', 't2.`lastRunner`', 't2.`lastRunDate`', 't2.`lastRunResult`'), array('t1.`assignedTo`', 't1.`lastRunner`', 't1.`lastRunDate`', 't1.`lastRunResult`'), $caseQuery);