From a2afd5353792b3dd8cbedbe1f79d7b04cdb76a88 Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Wed, 11 Aug 2021 13:05:43 +0800
Subject: [PATCH]  * Finish task #41235.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index c1b7aa0b27..f5ab1057d8 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2269,7 +2269,7 @@ class execution extends control
 
         $currentMembers = $this->execution->getTeamMembers($executionID);
         $members2Import = $this->execution->getMembers2Import($team2Import, array_keys($currentMembers));
-        $teams2Import   = $this->execution->getTeams2Import($this->app->user->account, $executionID);
+        $teams2Import   = $this->loadModel('personnel')->getCopyObjects($executionID, 'sprint');
         $teams2Import   = array('' => '') + $teams2Import;
 
         /* Append users for get users. */
diff --git a/module/execution/model.php b/module/execution/model.php
index 0e416d6bb5..d838a3f9ff 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2434,7 +2434,7 @@ class executionModel extends model
         return $this->dao->select('account, role, hours')
             ->from(TABLE_TEAM)
             ->where('root')->eq($execution)
-            ->andWhere('type')->eq('execution')
+            ->andWhere('type')->in('project,execution')
             ->andWhere('account')->notIN($currentMembers)
             ->fetchAll('account');
     }