Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687

2022-08-15 10:48:36 +08:00
parent 4cc14dfe59 9ebd84ddcb
commit 4f08c31607
157 changed files with 1721 additions and 1220 deletions
@@ -3607,8 +3607,7 @@ class bugModel extends model
        if($table) $relatedObjects = $this->dao->select($pairs)->from($table)->where('id')->in($relatedObjectIdList)->fetchPairs();

        if(in_array($object, array('build','resolvedBuild'))) $relatedObjects= array('trunk' => $this->lang->trunk) + $relatedObjects;
-
-        return $relatedObjects;
+        return array('' => '', 0 => '') + $relatedObjects;
    }

    /**