From 4785e2831f5c0806a9954a33d388dfdb1e6338ea Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Thu, 17 Oct 2024 14:50:26 +0800 Subject: [PATCH] 1 --- webapp/controller/CircuitController.class.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/webapp/controller/CircuitController.class.php b/webapp/controller/CircuitController.class.php index b70fcf3a..cc351ec7 100644 --- a/webapp/controller/CircuitController.class.php +++ b/webapp/controller/CircuitController.class.php @@ -38,15 +38,16 @@ class CircuitController extends BaseAuthedController { $nextCircuitMeta = mt\CircuitTime::getNextCircuit(); $taskList = array(); if (!$circuitCircuitMeta && $nextCircuitMeta){ - $metas = \mt\CircuitTask::getListBySeason($nextCircuitMeta['circuit_season']); - if (count($metas) > 0){ - foreach ($metas as $meta){ - array_push($taskList, array( - 'task_id' => $meta['id'], - 'current' => CircuitTask::getCurrentVal($nextCircuitMeta['circuit_season'],$meta['type']), - 'target' => $meta['target'], - )); - } + $circuitCircuitMeta = $nextCircuitMeta; + } + $metas = \mt\CircuitTask::getListBySeason($circuitCircuitMeta['circuit_season']); + if (count($metas) > 0){ + foreach ($metas as $meta){ + array_push($taskList, array( + 'task_id' => $meta['id'], + 'current' => CircuitTask::getCurrentVal($circuitCircuitMeta['circuit_season'],$meta['type']), + 'target' => $meta['target'], + )); } } $this->_rspData(array('list' => $taskList));