From 665fbd6da68ece970f24885411c8e41290e08690 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Tue, 13 May 2025 15:30:32 +0800 Subject: [PATCH] * Optimize code. --- module/task/model.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index 74d99730bd..5e3fe02d97 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1824,15 +1824,16 @@ class taskModel extends model foreach($taskList as $taskID => $task) { $prefix = $task->parent > 0 ? "[{$this->lang->task->childrenAB}] " : ''; + $finishedBy = !empty($task->finishedByRealName) ? "{$task->finishedByRealName}:" : ''; $task->rawName = !empty($task->rawName) ? $task->rawName : $task->name; - $task->name = $task->parent > 0 ? ($prefix . "$task->id:" . (empty($task->finishedByRealName) ? '' : "$task->finishedByRealName:") . "$task->rawName") : $task->rawName; + $task->name = $task->parent > 0 ? "{$prefix}{$task->id}:{$finishedBy}{$task->rawName}" : $task->rawName; if(!empty($executionID) && $task->execution != $executionID) $task->name = $task->name . " [{$this->lang->task->otherExecution}]"; if(!empty($taskList[$task->parent])) { $parent = $taskList[$task->parent]; $parent->rawName = !empty($parent->rawName) ? $parent->rawName : $parent->name; - $parent->name = "[{$this->lang->task->parentAB}] " . "$parent->id:" . (empty($parent->finishedByRealName) ? '' : "$parent->finishedByRealName:") . "$parent->rawName"; + $parent->name = "[{$this->lang->task->parentAB}] " . "{$parent->id}:" . (empty($parent->finishedByRealName) ? '' : "$parent->finishedByRealName:") . $parent->rawName; } } foreach($taskList as $taskID => $task) $taskPairs[$taskID] = $task->name;