Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'fix_bug_qxz' into 'master'

Browse Source 
* Fix bug#34063 again.

See merge request easycorp/zentaopms!7541
This commit is contained in:
刘刚
2023-04-21 05:33:25 +00:00
parent 6d327074c9 4791f83177
commit ad47f232ae
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+15 -9
View File
@@ -1455,6 +1455,21 @@ class pivotModel extends model
$this->getColumnConfig($groupRows, $configs, $groups, $index, $haveNext);
}
/* Get group field lang */
foreach($groups as $group)
{
$options = $this->getSysOptions($fields[$group]['type'], $fields[$group]['object'], $fields[$group]['field'], $sql);
foreach($groupsRow as $row)
{
if(isset($row->$group))
{
$value = $row->$group;
$lang = isset($options[$value]) ? $options[$value] : $value;
$row->$group = $lang;
}
}
}
$data = new stdclass();
$data->groups = $groups;
$data->cols = $cols;
@@ -2049,13 +2064,6 @@ class pivotModel extends model
}
$table .= "</thead>";
$optionList = array();
foreach($data->groups as $group)
{
if(!isset($optionList[$group])) $optionList[$group] = array();
if(isset($fields[$group])) $optionList[$group] = $this->getSysOptions($fields[$group]['type'], $fields[$group]['object'], $fields[$group]['field'], $sql);
}
/* Init table tbody. */
$table .= "<tbody>";
$rowCount = 0;
@@ -2076,8 +2084,6 @@ class pivotModel extends model
if($isGroup)
{
$groupName = $data->cols[0][$j]->name;
if(!isset($optionList[$groupName])) continue;
if(isset($optionList[$groupName][$lineValue])) $lineValue = $optionList[$groupName][$lineValue];
}
if(is_numeric($lineValue)) $lineValue = round($lineValue, 2);