From b4f6b346b8a420de78998858c19a1a7d6686c06b Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 3 Nov 2022 07:16:01 +0000
Subject: [PATCH] * Fix bug for review code.

---
 module/admin/control.php |  1 +
 module/custom/model.php  | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/module/admin/control.php b/module/admin/control.php
index 593580d84e..3d2d0cbe16 100644
--- a/module/admin/control.php
+++ b/module/admin/control.php
@@ -254,6 +254,7 @@ class admin extends control
             }
             $closedFeatures = rtrim($closedFeatures, ',');
             $this->loadModel('setting')->setItem('system.common.closedFeatures', $closedFeatures);
+            $this->loadModel('custom')->processMeasrecordCron();
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'top'));
         }
         $this->view->title            = $this->lang->admin->setModuleIndex;
diff --git a/module/custom/model.php b/module/custom/model.php
index fdab377b44..b0836a4f45 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -907,7 +907,7 @@ class customModel extends model
         $disabledFeatures = rtrim($disabledFeatures, ',');
         $this->loadModel('setting')->setItem('system.common.disabledFeatures', $disabledFeatures);
 
-        $this->processMeasrecordCron($disabledFeatures);
+        $this->processMeasrecordCron();
     }
 
     /**
@@ -1057,17 +1057,21 @@ class customModel extends model
     /**
      * Process measrecord cron.
      *
-     * @param  string  $disabledFeatures
      * @access public
      * @return void
      */
-    public function processMeasrecordCron($disabledFeatures)
+    public function processMeasrecordCron()
     {
-        $cronStatus = 'normal';
+        $this->loadModel('setting');
+        $closedFeatures   = $this->setting->getItem('owner=system&module=common&section=&key=closedFeatures');
+        $disabledFeatures = $this->setting->getItem('owner=system&module=common&section=&key=disabledFeatures');
+        $disabledFeatures = $disabledFeatures . ',' . $closedFeatures;
 
-        $hasWaterfall           = strpos(",{$this->config->disabledFeatures},",  ',waterfall,')           === false;
-        $hasScrumMeasrecord     = strpos(",{$this->config->disabledFeatures},",  ',scrumMeasrecord,')     === false;
-        $hasWaterfallMeasrecord = (strpos(",{$this->config->disabledFeatures},", ',waterfallMeasrecord,') === false and $hasWaterfall);
+        $hasWaterfall           = strpos(",{$disabledFeatures},",  ',waterfall,')           === false;
+        $hasScrumMeasrecord     = strpos(",{$disabledFeatures},",  ',scrumMeasrecord,')     === false;
+        $hasWaterfallMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallMeasrecord,') === false and $hasWaterfall);
+
+        $cronStatus = 'normal';
         if(!$hasScrumMeasrecord and !$hasWaterfallMeasrecord) $cronStatus = 'stop';
 
         $this->loadModel('cron');