From 7659a2376c5fcac9167414545ec6da0d6c1d7eb5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 19 May 2022 10:38:00 +0800 Subject: [PATCH] * Code format for task #54320. --- module/bug/model.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 1fbc4ccc5c..d49fd2da3f 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2649,14 +2649,20 @@ class bugModel extends model /** * Get by assigned by me. + * @param array $productIDList + * @param int|string $branch + * @param array $modules + * @param array $executions + * @param string $sort + * @param object $pager + * @param int $projectID * - * @param int $sonarqubeID * @access public * @return array */ public function getByAssignedbyme($productIDList, $branch, $modules, $executions, $sort, $pager, $projectID) { - $actionID = $this->dao->select('objectID')->from(TABLE_ACTION)->where('objectType')->eq('bug')->andWhere('action')->eq('assigned')->andWhere('actor')->eq($this->app->user->account)->fetchPairs('objectID', 'objectID'); + $actionIDList = $this->dao->select('objectID')->from(TABLE_ACTION)->where('objectType')->eq('bug')->andWhere('action')->eq('assigned')->andWhere('actor')->eq($this->app->user->account)->fetchPairs('objectID', 'objectID'); return $this->dao->select('*')->from(TABLE_BUG) ->where('product')->in($productIDList) ->beginIF($branch !== 'all')->andWhere('branch')->in($branch)->fi() @@ -2665,7 +2671,7 @@ class bugModel extends model ->andWhere('execution')->in(array_keys($executions)) ->andWhere('deleted')->eq(0) ->andWhere('status')->ne('closed') - ->andWhere('id')->in($actionID) + ->andWhere('id')->in($actionIDList) ->orderBy($sort) ->page($pager) ->fetchAll();