From e3ff7b36e6aeb525e50970770a68204bcaddf36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 28 Apr 2022 13:28:09 +0800 Subject: [PATCH] * Fix bug #14997. --- module/programplan/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 module/programplan/model.php diff --git a/module/programplan/model.php b/module/programplan/model.php old mode 100644 new mode 100755 index 8d5e94cab6..ed8eb2df8a --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -216,7 +216,7 @@ class programplanModel extends model if(empty($selectCustom)) $selectCustom = $this->loadModel('setting')->getItem("owner={$owner}&module={$module}§ion={$section}&key={$object}"); $tasks = array(); - if(strpos($selectCustom, 'task') !== false) $tasks = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)->andWhere('execution')->in($planIdList)->fetchAll('id'); + $tasks = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)->andWhere('execution')->in($planIdList)->fetchAll('id'); if($baselineID) { @@ -265,7 +265,7 @@ class programplanModel extends model if($data->start_date) $data->start_date = date('d-m-Y', strtotime($data->start_date)); if($data->start_date == '' or $data->endDate == '') $data->duration = 0; - $datas['data'][] = $data; + if(strpos($selectCustom, 'task') !== false) $datas['data'][] = $data; foreach($stageIndex as $index => $stage) { if($stage['planID'] == $task->execution)