From 934240acb6b8b54a8da9ea7dcacda4dd8899c704 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 4 Nov 2022 08:57:51 +0800
Subject: [PATCH] * Code for change story.

---
 module/story/model.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index 68f00a9f5a..8b74b57971 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -54,7 +54,12 @@ class storyModel extends model
             ->beginIF(!$story->siblings)->andWhere('t1.story')->in($story->id)
             ->orderBy('t1.`order` DESC')
             ->fetchAll('project');
-        $story->tasks  = $this->dao->select('id, name, assignedTo, execution, status, consumed, `left`,type')->from(TABLE_TASK)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->orderBy('id DESC')->fetchGroup('execution');
+        $story->tasks  = $this->dao->select('id, name, assignedTo, execution, status, consumed, `left`,type')->from(TABLE_TASK)
+            ->where('deleted')->eq(0)
+            ->beginIF($story->siblings)->andWhere('story')->in(ltrim($story->siblings, ',') . $story->id)
+            ->beginIF(!$story->siblings)->andWhere('story')->in($story->id)
+            ->orderBy('id DESC')
+            ->fetchGroup('execution');
         $story->stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->eq($storyID)->fetchPairs('branch', 'stage');
         //$story->bugCount  = $this->dao->select('COUNT(*)')->alias('count')->from(TABLE_BUG)->where('story')->eq($storyID)->fetch('count');
         //$story->caseCount = $this->dao->select('COUNT(*)')->alias('count')->from(TABLE_CASE)->where('story')->eq($storyID)->fetch('count');