Merge branch 'fixbug' into 'master'

* Fix bug for bug export.

See merge request easycorp/zentaopms!5320
This commit is contained in:
王怡栋
2022-09-14 06:46:24 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -3638,7 +3638,7 @@ class bugModel extends model
public function getRelatedObjects($object, $pairs = '')
{
/* Get bugs. */
$bugs = $this->dao->select('*')->from(TABLE_BUG)->where($this->session->bugQueryCondition)->fetchAll('id');
$bugs = $this->loadModel('port')->getQueryDatas('bug');
/* Get related objects id lists. */
$relatedObjectIdList = array();
+1 -1
View File
@@ -695,7 +695,7 @@ class portModel extends model
$lists[$listName] = $fieldList[$field]['values'];
if(strpos($this->config->$model->sysLangFields, $field)) $lists[$listName] = join(',', $fieldList[$field]['values']);
}
$this->config->excel->sysDataField[] = $field;
if(is_array($lists[$listName])) $this->config->excel->sysDataField[] = $field;
}
$lists['listStyle'] = $listFields;