From c69ffb8d7df73a2625af199f88802546cbde3266 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Mon, 6 Jun 2022 04:30:37 +0000
Subject: [PATCH] * Fix bug#23246

---
 module/execution/model.php | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 482348b260..1cc5b1f52d 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2033,13 +2033,28 @@ class executionModel extends model
      */
     public function getTasks2Imported($toExecution, $branches)
     {
-        $execution       = $this->getById($toExecution);
-        $project         = $this->loadModel('project')->getById($execution->project);
-        $brotherProjects = $this->project->getBrotherProjects($project);
-        $executions      = $this->dao->select('id')->from(TABLE_EXECUTION)
-            ->where('project')->in($brotherProjects)
-            ->andWhere('status')->ne('closed')
-            ->fetchPairs('id');
+        if($this->config->systemMode == 'classic')
+        {
+            $products = $this->loadModel('product')->getProducts($toExecution);
+            if(empty($products)) return array();
+
+            $execution  = $this->getById($toExecution);
+            $executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+                ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
+                ->where('t1.product')->in(array_keys($products))
+                ->andWhere('t2.project')->eq($execution->project)
+                ->fetchGroup('project');
+        }
+        else
+        {
+            $execution       = $this->getById($toExecution);
+            $project         = $this->loadModel('project')->getById($execution->project);
+            $brotherProjects = $this->project->getBrotherProjects($project);
+            $executions      = $this->dao->select('id')->from(TABLE_EXECUTION)
+                ->where('project')->in($brotherProjects)
+                ->andWhere('status')->ne('closed')
+                ->fetchPairs('id');
+        }
 
         $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')