|
@@ -3850,16 +3850,20 @@ class Database
|
|
|
if (isset($v['name'])) {
|
|
|
$v = $v['name'];
|
|
|
}
|
|
|
- $param['value'][$v][$key] = $k;
|
|
|
+ $param['value'][$v]['main_' . $key] = $k;
|
|
|
}
|
|
|
} else {
|
|
|
foreach ($param['option'] as $k => $v) {
|
|
|
if (isset($v['name'])) {
|
|
|
$v = $v['name'];
|
|
|
}
|
|
|
- foreach ($value[$k-1] as $k1 => $v1) {
|
|
|
+ foreach ($value[$k] as $k1 => $v1) {
|
|
|
$param['value'][$v][$k1] = $v1;
|
|
|
}
|
|
|
+ /*
|
|
|
+ foreach ($value[$k-1] as $k1 => $v1) {
|
|
|
+ $param['value'][$v][$k1] = $v1;
|
|
|
+ }*/
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3870,7 +3874,7 @@ class Database
|
|
|
if (isset($v['name'])) {
|
|
|
$v = $v['name'];
|
|
|
}
|
|
|
- $param['value'][$v][$key] = $k;
|
|
|
+ $param['value'][$v]['main_' . $key] = $k;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -3901,6 +3905,8 @@ class Database
|
|
|
$param['value'] = Dever::array_decode($param['value']);
|
|
|
}
|
|
|
|
|
|
+ //print_r($param['value']);die;
|
|
|
+
|
|
|
if (is_array($param['value'])) {
|
|
|
$i = 0;
|
|
|
foreach ($param['value'] as $k => $v) {
|