From 4b7b080d1436e8018c483f63172950cd776bf9c5 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycrop.ltd>
Date: Wed, 10 May 2023 09:31:31 +0800
Subject: [PATCH] * Merge the if condition for function getBeginEnd4CFD.

---
 module/execution/model.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 9e33afe828..5f09e1700f 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4025,17 +4025,14 @@ class executionModel extends model
 
         foreach($dateList as $date)
         {
-            if(!isset($burnData[$date]))
+            if(!isset($burnData[$date]) && ($showDelay ? $date >= $execution->end : $date <= $execution->end))
             {
-                if(($showDelay and $date < $execution->end) or (!$showDelay and $date > $execution->end))
-                {
-                    $set = new stdClass();
-                    $set->name    = $date;
-                    $set->value   = 'null';
-                    $set->$burnBy = 0;
+                $set = new stdclass();
+                $set->name    = $date;
+                $set->value   = 'null';
+                $set->$burnBy = 0;
 
-                    $burnData[$date] = $set;
-                }
+                $burnData[$date] = $set;
             }
         }