From d2f57affa61778d98643c90ec6d55b0bcfdbfb9b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 30 Nov 2021 10:30:36 +0800
Subject: [PATCH] * Finish task #45000.

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

diff --git a/module/testtask/model.php b/module/testtask/model.php
index da81289a4a..0e3b1f146d 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -359,7 +359,7 @@ class testtaskModel extends model
                 ->andWhere('id')->notIN($linkedCases)
                 ->andWhere('status')->ne('wait')
                 ->andWhere('type')->ne('unit')
-                ->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
+                ->beginIF($task->branch !== '')->andWhere('branch')->in("0,$task->branch")->fi()
                 ->andWhere('deleted')->eq(0)
                 ->orderBy('id desc')
                 ->page($pager)
@@ -389,7 +389,7 @@ class testtaskModel extends model
                 ->andWhere('product')->eq($productID)
                 ->andWhere('status')->ne('wait')
                 ->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
-                ->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
+                ->beginIF($task->branch !== '')->andWhere('branch')->in("0,$task->branch")->fi()
                 ->andWhere('story')->in(trim($stories, ','))
                 ->andWhere('deleted')->eq(0)
                 ->orderBy('id desc')
@@ -422,7 +422,7 @@ class testtaskModel extends model
                 ->andWhere('product')->eq($productID)
                 ->andWhere('status')->ne('wait')
                 ->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
-                ->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
+                ->beginIF($task->branch !== '')->andWhere('branch')->in("0,$task->branch")->fi()
                 ->andWhere('fromBug')->in(trim($bugs, ','))
                 ->andWhere('deleted')->eq(0)
                 ->orderBy('id desc')