From 34ec8c0a22e89bec140a7f7ec30751e24987353d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 26 Aug 2022 16:47:22 +0800
Subject: [PATCH] * Fix bug#26779.

---
 module/story/control.php | 2 +-
 module/story/model.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 1fde5ca354..0d2b6cf323 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1878,7 +1878,7 @@ class story extends control
         $storyGroup = array();
         foreach($stories as $story)
         {
-            if(strpos('draft,closed', $story->status) !== false) continue;
+            if(strpos('draft,reviewing,changing,closed', $story->status) !== false) continue;
             if(isset($storyGroup[$story->module])) continue;
             $storyGroup[$story->module] = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $story->module, 'short', 'active');
         }
diff --git a/module/story/model.php b/module/story/model.php
index c62e5af575..31d1203cba 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3010,7 +3010,7 @@ class storyModel extends model
         if($excludeStories) $storyQuery = $storyQuery . ' AND `id` NOT ' . helper::dbIN($excludeStories);
         if($this->app->moduleName == 'productplan') $storyQuery .= " AND `status` NOT IN ('closed') AND `parent` >= 0 ";
         $allBranch = "`branch` = 'all'";
-        if($executionID != '')
+        if(!empty($executionID))
         {
             $normalProducts = array();
             $branchProducts = array();