From a1bd34b3cedafe2fd304e3fa2f387ada45d6fba3 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 2 Dec 2022 15:32:36 +0800
Subject: [PATCH] * fix bug #30496

---
 module/execution/control.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 5fbc2746aa..74404a338b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -4153,11 +4153,10 @@ class execution extends control
         if(!empty($planStory))
         {
             $projectProducts = $this->loadModel('project')->getBranchesByProject($executionID);
-
             foreach($planStory as $id => $story)
             {
                 $projectBranches = zget($projectProducts, $story->product, array());
-                if($story->status == 'draft' or $story->status == 'reviewing' or (!empty($projectBranches) and !isset($projectBranches[$story->branch])))
+                if($story->status == 'draft' or $story->status == 'reviewing' or (!empty($projectBranches) and !isset($projectBranches[$story->branch]) and !empty($story->branch)))
                 {
                     $count++;
                     unset($planStory[$id]);