From 9e34f458a9723e1224991dc2e4179cf2e193f6de Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 17 Dec 2020 13:25:34 +0800
Subject: [PATCH] * Fix bug#3761.

---
 module/project/model.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 3457f48717..da5cff0b27 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1797,8 +1797,13 @@ class projectModel extends model
     {
         $this->loadModel('task');
 
-        $products = $this->getProducts($toProject);
-        $projects = $this->dao->select('product, project')->from(TABLE_PROJECTPRODUCT)->where('product')->in(array_keys($products))->fetchGroup('project');
+        $products   = $this->getProducts($toProject);
+        $project    = $this->getById($toProject);
+        $executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->where('t1.product')->in(array_keys($products))
+            ->andWhere('t2.project')->eq($project->project)
+            ->fetchGroup('project');
         $branches = str_replace(',', "','", $branches);
 
         $tasks = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName')->from(TABLE_TASK)->alias('t1')
@@ -1807,7 +1812,7 @@ class projectModel extends model
             ->where('t1.status')->in('wait, doing, pause, cancel')
             ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t1.parent')->lt(1)
-            ->andWhere('t1.project')->in(array_keys($projects))
+            ->andWhere('t1.project')->in(array_keys($executions))
             ->andWhere("(t1.story = 0 OR (t2.branch in ('0','" . join("','", $branches) . "') and t2.product " . helper::dbIN(array_keys($branches)) . "))")
             ->fetchGroup('project', 'id');
         return $tasks;