From 773437ebe0f5db4c9aa66ea8ecbb7bd2c05788b8 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 6 Jun 2025 14:07:24 +0800 Subject: [PATCH] * [bug#63105] adjust task report filter data. --- module/task/zen.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/task/zen.php b/module/task/zen.php index 5de9b3a477..b679e57886 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -2148,7 +2148,7 @@ class taskZen extends task $rightConditions = array(); $searchFields = $this->session->taskForm; $fieldNames = json_decode($searchConfig['searchFields']); - if(!$searchFields) return ''; + if(!$searchFields) return sprintf($this->lang->task->report->tpl->feature, $this->lang->all); $this->app->loadLang('search'); $groupAndOr = 'and'; @@ -2173,7 +2173,8 @@ class taskZen extends task elseif($index < 6) $rightConditions[] = zget($this->lang->search->andor, $field['andOr']) . sprintf($this->lang->task->report->tpl->search, $fieldName, $operator, $field['value']); } - if(empty($leftConditions) && empty($rightConditions)) return ''; + if(empty($leftConditions) && empty($rightConditions)) return sprintf($this->lang->task->report->tpl->feature, $this->lang->all); + if(empty($leftConditions)) return implode('', $rightConditions); if(empty($rightConditions)) return implode('', $leftConditions);