|
|
@@ -1770,7 +1770,13 @@ class Database
|
|
|
# 处理同步
|
|
|
if (isset($v['sync']) && strpos($k, '-')) {
|
|
|
$temp = explode('-', $k);
|
|
|
- $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][1] => $vi[$v['sync'][0]]));
|
|
|
+
|
|
|
+ if ($vi[$v['sync'][0]] > 0) {
|
|
|
+ $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][1] => $vi[$v['sync'][0]]));
|
|
|
+ } else {
|
|
|
+ $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][2] => $vi[$v['sync'][2]], 'option_' . $v['sync'][3] => $vi[$v['sync'][0]]));
|
|
|
+ }
|
|
|
+
|
|
|
$data[$ki][$k] = $vi[$k] = isset($load[$temp[2]]) ? $load[$temp[2]] : $v['default'];
|
|
|
}
|
|
|
if (true) {
|
|
|
@@ -2276,6 +2282,7 @@ class Database
|
|
|
if ($v[$vi['sync'][0]] > 0) {
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][1] => $v[$vi['sync'][0]]));
|
|
|
} else {
|
|
|
+ echo $v[$vi['sync'][0]];die;
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][2] => $v[$vi['sync'][2]], 'option_' . $vi['sync'][3] => $v[$vi['sync'][0]]));
|
|
|
}
|
|
|
|
|
|
@@ -2996,7 +3003,7 @@ class Database
|
|
|
# 处理同步
|
|
|
if (isset($param['sync']) && isset($data[$param['sync'][0]]) && strpos($key, '-')) {
|
|
|
$temp = explode('-', $key);
|
|
|
- if ($v[$vi['sync'][0]] > 0) {
|
|
|
+ if ($data[$param['sync'][0]] > 0) {
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][1] => $data[$param['sync'][0]]));
|
|
|
} else {
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][2] => $data[$param['sync'][2]], 'option_' . $param['sync'][3] => $data[$param['sync'][0]]));
|
dever