From 598dce1ebd5b602f563182b76408d07af164be73 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 8 Nov 2023 09:19:43 +0800
Subject: [PATCH] * Merge commit b8841cd34d, fix bug #35137.g

---
 module/execution/model.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 5ec8019f1c..245b0af6dc 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -3470,7 +3470,15 @@ class executionModel extends model
         {
             /* If executionBurnList > $itemCounts, split it, else call processBurnData() to pad burnList. */
             $begin             = helper::isZeroDate($executions[$executionID]->begin) ? $executions[$executionID]->openedDate : $executions[$executionID]->begin;
-            $executionBurnList = $this->processBurnData($executionBurnList, $this->config->execution->defaultBurnPeriod, $begin, $executions[$executionID]->end);
+            $end               = $executions[$executionID]->end;
+
+            /* Unset burn information that is greater than the execution end date. */
+            foreach($executionBurnList as $date => $burnInfo)
+            {
+                if($date > $end) unset($executionBurns[$date]);
+            }
+
+            $executionBurnList = $this->processBurnData($executionBurnList, $this->config->execution->defaultBurnPeriod, $begin, $end);
 
             /* Shorter names. */
             foreach($executionBurnList as $executionBurn)