From f0dbbeac78c8f8fcf8d3d71ee959bb10f1e0b964 Mon Sep 17 00:00:00 2001
From: liugang <liugang@easycorp.ltd>
Date: Fri, 13 Oct 2023 09:27:49 +0800
Subject: [PATCH] * testtaskModel: refactor the getLinkableCases method.

---
 module/testtask/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index 8a74580595..f9da29d1c5 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -343,7 +343,7 @@ class testtaskModel extends model
      * @access public
      * @return array
      */
-    public function getLinkableCases(int $productID, object $task, string $type, int $param, object $pager): array
+    public function getLinkableCases(int $productID, object $task, string $type = 'all', int $param = 0, object $pager = null): array
     {
         if($this->session->testcaseQuery == false) $this->session->set('testcaseQuery', ' 1 = 1');
         $query = $this->session->testcaseQuery;
@@ -379,9 +379,9 @@ class testtaskModel extends model
             ->where('deleted')->eq('0')
             ->andWhere('status')->ne('wait')
             ->andWhere('type')->ne('unit')
-            ->beginIF($task->branch !== '')->andWhere('branch')->in("0,{$task->branch}")->fi()
             ->beginIF($query)->andWhere($query)->fi()
             ->beginIF(!empty($linkedCases))->andWhere('id')->notIN($linkedCases)->fi()
+            ->beginIF($task->branch !== '')->andWhere('branch')->in("0,{$task->branch}")->fi()
             ->orderBy('id desc')
             ->page($pager)
             ->fetchAll();