|
@@ -1335,19 +1335,21 @@ class Database
|
|
$i++;
|
|
$i++;
|
|
$j = 0;
|
|
$j = 0;
|
|
foreach ($data as $ki => $vi) {
|
|
foreach ($data as $ki => $vi) {
|
|
- $value = $vi[$k];
|
|
|
|
|
|
+ if (isset($vi[$k])) {
|
|
|
|
+ $value = $vi[$k];
|
|
|
|
|
|
- if (is_string($v['list'])) {
|
|
|
|
- $value = $this->value($v['list'], $data[$ki], $config['struct']);
|
|
|
|
- }
|
|
|
|
- if (isset($v['option'])) {
|
|
|
|
- $value = $this->getOptionValue($value, $v);
|
|
|
|
- }
|
|
|
|
|
|
+ if (is_string($v['list'])) {
|
|
|
|
+ $value = $this->value($v['list'], $data[$ki], $config['struct']);
|
|
|
|
+ }
|
|
|
|
+ if (isset($v['option'])) {
|
|
|
|
+ $value = $this->getOptionValue($value, $v);
|
|
|
|
+ }
|
|
|
|
|
|
- //$value = mb_convert_encoding($value,'gb2312','utf-8');
|
|
|
|
|
|
+ //$value = mb_convert_encoding($value,'gb2312','utf-8');
|
|
|
|
|
|
- $body[$j][] = $value;
|
|
|
|
- $j++;
|
|
|
|
|
|
+ $body[$j][] = $value;
|
|
|
|
+ $j++;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|