From 20133f86ccff6aa496a9679a98e89f574dc98ad2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 13 Sep 2023 16:21:12 +0800
Subject: [PATCH] * Fix save execution plans error.

---
 module/execution/model.php                | 9 +++++++--
 module/execution/test/execution.class.php | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 1db9bebc66..73f597b3db 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4633,7 +4633,7 @@ class executionModel extends model
      * */
     public function createDefaultSprint(int $projectID): int
     {
-        $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch();
+        $project = $this->fetchByID($projectID);
 
         $executionData = new stdclass();
         $executionData->project     = $projectID;
@@ -4652,6 +4652,7 @@ class executionModel extends model
         $executionData->RD          = $this->app->user->account;
         $executionData->multiple    = '0';
         $executionData->whitelist   = '';
+        $executionData->plans       = array();
         $executionData->hasProduct  = $project->hasProduct;
         if($project->code) $executionData->code = $project->code;
 
@@ -4660,7 +4661,11 @@ class executionModel extends model
         {
             if($projectProduct->product) $executionData->products[] = $projectProduct->product;
             if($projectProduct->branch)  $executionData->branch[]   = $projectProduct->branch;
-            if($projectProduct->plan)    $executionData->plans[$projectProduct->product][$projectProduct->branch] = explode(',', trim($projectProduct->plan, ','));
+            if($projectProduct->plan)
+            {
+                $plans = explode(',', trim($projectProduct->plan, ','));
+                $executionData->plans[$projectProduct->product] = isset($executionData->plans[$projectProduct->product]) ? array_merge($executionData->plans[$projectProduct->product], $plans) : $plans;
+            }
         }
 
         $executionID = $this->create($executionData, array($this->app->user->account));
diff --git a/module/execution/test/execution.class.php b/module/execution/test/execution.class.php
index ca21144502..7662f018f9 100644
--- a/module/execution/test/execution.class.php
+++ b/module/execution/test/execution.class.php
@@ -180,10 +180,10 @@ class executionTest
         $whitelist = array('');
         $beginData = date('Y-m-d');
         $endData   = date('Y-m-d',strtotime("+$days day"));
-        $delta     = intval($dayNum) + 1;
+        $delta     = intval($days) + 1;
 
         $createFields = array('project' => (int)$project, 'name' => '', 'code' => '', 'begin' => $beginData, 'end' => $endData,
-            'lifetime' => 'short', 'status' => 'wait', 'products' => $products, 'days' => $days,
+            'lifetime' => 'short', 'status' => 'wait', 'products' => $products, 'days' => $days, 'type' => 'sprint',
             'plans' => $plans, 'team' => '', 'PO' => '', 'QD' => '', 'PM' => '', 'RD' => '', 'whitelist' => '',
             'desc' => '', 'acl' => 'private', 'percent' => '0', 'openedBy' => 'admin', 'openedDate' => date('Y-m-d H:i:s'));