From 2f8e2e03e31ad05a0f1e8d9bda11603da90dca8a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 18 May 2022 08:54:40 +0800
Subject: [PATCH] * Finish task #54336.

---
 module/execution/js/create.js         | 2 +-
 module/execution/view/create.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 2e76285f06..440e45a60d 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -73,7 +73,7 @@ $(function()
         });
     })
 
-    if(copyExecutionID != 0) $('#teams').change();
+    if(copyExecutionID != 0 || projectID != 0) $('#teams').change();
 
     var acl = $("[name^='acl']:checked").val();
     setWhite(acl);
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index a9ad07c665..434c094f6c 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -183,7 +183,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->execution->copyTeam;?></th>
-          <td><?php echo html::select('teams', $teams, $copyExecutionID, "class='form-control chosen' data-placeholder='{$lang->execution->copyTeamTip}'"); ?></td>
+          <td><?php echo html::select('teams', $teams, empty($copyExecution) ? $projectID : $copyExecutionID, "class='form-control chosen' data-placeholder='{$lang->execution->copyTeamTip}'"); ?></td>
         </tr>
         <tr>
           <th rowspan='2'><?php echo $lang->execution->owner;?></th>