From 41eeabc074b59cbc213b0222acb06badc537ef1c Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Tue, 4 Jan 2022 15:32:54 +0800
Subject: [PATCH] *Fix bug 18168.

---
 module/productplan/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/productplan/model.php b/module/productplan/model.php
index c8f805d3a7..23b4edf850 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -497,11 +497,11 @@ class productplanModel extends model
         }
 
         $requiredFields = $oldPlan->status == 'wait' ? $this->config->productplan->edit->requiredFields : 'title, begin, end';
-        if(!$this->post->future and strpos($requiredFields, 'begin') !== false and empty($_POST['begin']))
+        if($plan->status != 'wait' and $plan->begin == $this->config->productplan->future)
         {
             dao::$errors['begin'] = sprintf($this->lang->error->notempty, $this->lang->productplan->begin);
         }
-        if(!$this->post->future and strpos($requiredFields, 'end') !== false and empty($_POST['end']))
+        if($plan->status != 'wait' and $plan->end == $this->config->productplan->future)
         {
             dao::$errors['end'] = sprintf($this->lang->error->notempty, $this->lang->productplan->end);
         }