From 277ee237d91aa1936300a6a58c0887d2959ceb7a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 23 Aug 2022 16:25:38 +0800
Subject: [PATCH] * Optimize code for task #65808, #65807.

---
 module/build/control.php          | 6 ++----
 module/projectrelease/control.php | 9 +++------
 module/release/control.php        | 6 ++----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 9feda59a49..50cc8a87da 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -241,8 +241,7 @@ class build extends control
         if($product->type != 'normal') $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
 
         $bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1);
-        $bugs = $this->dao->select('*')
-            ->from(TABLE_BUG)
+        $bugs = $this->dao->select('*')->from(TABLE_BUG)
             ->where('id')->in($build->bugs)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'bug')->orderBy($sort)->fi()
@@ -251,8 +250,7 @@ class build extends control
 
         /* Get stories and stages. */
         $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
-        $stories    = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")
-            ->from(TABLE_STORY)
+        $stories    = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")->from(TABLE_STORY)
             ->where('id')->in($build->stories)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'story')->orderBy($sort)->fi()
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 353905ead1..f28fa403f5 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -234,8 +234,7 @@ class projectrelease extends control
         if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
 
         $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
-        $stories    = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")
-            ->from(TABLE_STORY)
+        $stories    = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")->from(TABLE_STORY)
             ->where('id')->in($release->stories)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'story')->orderBy($sort)->fi()
@@ -249,8 +248,7 @@ class projectrelease extends control
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
 
         $bugPager = new pager($type == 'bug' ? $recTotal : 0, $recPerPage, $type == 'bug' ? $pageID : 1);
-        $bugs = $this->dao->select('*')
-            ->from(TABLE_BUG)
+        $bugs = $this->dao->select('*')->from(TABLE_BUG)
             ->where('id')->in($release->bugs)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'bug')->orderBy($sort)->fi()
@@ -261,8 +259,7 @@ class projectrelease extends control
         $leftBugPager = new pager($type == 'leftBug' ? $recTotal : 0, $recPerPage, $type == 'leftBug' ? $pageID : 1);
         if($type == 'leftBug' and strpos($orderBy, 'severity_') !== false) $sort = str_replace('severity_', 'severityOrder_', $sort);
 
-        $leftBugs = $this->dao->select("*, IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder")
-            ->from(TABLE_BUG)
+        $leftBugs = $this->dao->select("*, IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder")->from(TABLE_BUG)
             ->where('id')->in($release->leftBugs)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'leftBug')->orderBy($sort)->fi()
diff --git a/module/release/control.php b/module/release/control.php
index 4cd6be803d..1ff6c453b6 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -194,8 +194,7 @@ class release extends control
         if(strpos($sort, 'pri_') !== false) $sort = str_replace('pri_', 'priOrder_', $sort);
 
         $storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
-        $stories = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")
-            ->from(TABLE_STORY)
+        $stories = $this->dao->select("*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder")->from(TABLE_STORY)
             ->where('id')->in($release->stories)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'story')->orderBy($sort)->fi()
@@ -218,8 +217,7 @@ class release extends control
         $leftBugPager = new pager($type == 'leftBug' ? $recTotal : 0, $recPerPage, $type == 'leftBug' ? $pageID : 1);
         if($type == 'leftBug' and strpos($orderBy, 'severity_') !== false) $sort = str_replace('severity_', 'severityOrder_', $sort);
 
-        $leftBugs = $this->dao->select("*, IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder")
-            ->from(TABLE_BUG)
+        $leftBugs = $this->dao->select("*, IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder")->from(TABLE_BUG)
             ->where('id')->in($release->leftBugs)
             ->andWhere('deleted')->eq(0)
             ->beginIF($type == 'leftBug')->orderBy($sort)->fi()