From 995c88a6784d39df186709bd0d3a2766d97699a3 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 18 Mar 2022 11:57:22 +0800
Subject: [PATCH] * Fix bug #20112.

---
 module/testcase/control.php | 1 +
 module/testcase/model.php   | 2 +-
 module/testtask/control.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index bb1c8fc3ac..bb4046a21f 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -263,6 +263,7 @@ class testcase extends control
         {
             if($groupBy == 'story')
             {
+                if($case->storyDeleted) continue;
                 $groupCases[$case->story][] = $case;
                 $groupByList[$case->story]  = $case->storyTitle;
             }
diff --git a/module/testcase/model.php b/module/testcase/model.php
index a2029cd58e..43ba662f40 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -231,7 +231,7 @@ class testcaseModel extends model
      */
     public function getModuleCases($productID, $branch = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $browseType = '', $auto = 'no')
     {
-        $stmt = $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1')
+        $stmt = $this->dao->select('t1.*, t2.title as storyTitle, t2.deleted as storyDeleted')->from(TABLE_CASE)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id');
 
         if($this->app->tab == 'project') $stmt = $stmt->leftJoin(TABLE_PROJECTCASE)->alias('t3')->on('t1.id=t3.case');
diff --git a/module/testtask/control.php b/module/testtask/control.php
index cbd1390f7a..03c4bfbff9 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -678,7 +678,7 @@ class testtask extends control
         if($groupBy == 'story' && $task->build)
         {
             $buildStoryIdList = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
-            $buildStories     = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($buildStoryIdList)->andWhere('id')->notin(array_keys($groupCases))->fetchAll('id');
+            $buildStories     = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($buildStoryIdList)->andWhere('deleted')->eq(0)->andWhere('id')->notin(array_keys($groupCases))->fetchAll('id');
             foreach($buildStories as $buildStory)
             {
                 $groupCases[$buildStory->id][] = $buildStory;