From ac5f86ccb644e55f28480215d2f58bcce0fd5f1d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 5 Dec 2024 10:42:20 +0800 Subject: [PATCH] * [perf story #69212] Adjust code. --- module/block/ui/projectstatisticblock.html.php | 5 +---- module/story/model.php | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php index 825f29b0bb..edb3811118 100644 --- a/module/block/ui/projectstatisticblock.html.php +++ b/module/block/ui/projectstatisticblock.html.php @@ -110,10 +110,7 @@ if($project) $cellItems[] = item ( - set::name - ( - $lang->block->projectstatistic->{$field} - ), + set::name($lang->block->projectstatistic->{$field}), to::suffixName ( isset($lang->block->tooltips[$field]) ? icon diff --git a/module/story/model.php b/module/story/model.php index 882befabe7..eaae3b7bda 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2297,7 +2297,7 @@ class storyModel extends model } $productQuery = $this->storyTao->buildProductsCondition($productID, $branch); - $stories = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")->from(TABLE_STORY) + $stories = $this->dao->select("*,plan,path,IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")->from(TABLE_STORY) ->where('deleted')->eq(0) ->andWhere($productQuery) ->beginIF(!$hasParent)->andWhere("isParent")->eq('0')->fi() @@ -3058,7 +3058,7 @@ class storyModel extends model ->beginIF($productID)->andWhere('t1.product')->eq((int)$productID)->fi() ->orderBy($orderBy) ->page($pager) - ->fetchAll('id'); + ->fetchAll('id', false); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false); $productIdList = array();