From 952c013ecae23e36178b504270eea6bf016891f4 Mon Sep 17 00:00:00 2001 From: z Date: Thu, 6 Aug 2020 10:51:43 +0800 Subject: [PATCH] * fix for getModuleOwner. --- module/bug/model.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 7609983bac..630178bfd2 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -594,10 +594,14 @@ class bugModel extends model public function getModuleOwner($moduleID, $productID) { $users = $this->loadModel('user')->getPairs('nodeleted'); + $owner = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('QD'); + $owner = isset($users[$owner]) ? $owner : ''; if($moduleID) { - $module = $this->dao->findByID($moduleID)->from(TABLE_MODULE)->fetch(); + $module = $this->dao->findByID($moduleID)->from(TABLE_MODULE)->andWhere('root')->eq($productID)->fetch(); + if(empty($module)) return $owner; + if($module->owner and isset($users[$module->owner])) return $module->owner; $moduleIDList = explode(',', trim(str_replace(",$module->id,", ',', $module->path), ',')); @@ -616,8 +620,7 @@ class bugModel extends model } } - $owner = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('QD'); - return isset($users[$owner]) ? $owner : ''; + return $owner; } /**