|
@@ -85,8 +85,13 @@ class Data
|
|
|
}
|
|
|
|
|
|
if ($data['module'][$k]['data']) {
|
|
|
- foreach ($data['module'][$k]['data'] as $k1 => $v1) {
|
|
|
- $data['module'][$k]['data'][$k1] = $this->getOne($v1, $v, $cdate);
|
|
|
+ $result = $data['module'][$k]['data'];
|
|
|
+ $data['module'][$k]['data'] = array();
|
|
|
+ foreach ($result as $k1 => $v1) {
|
|
|
+ $v1 = $this->getOne($v1, $v, $cdate);
|
|
|
+ if ($v1) {
|
|
|
+ $data['module'][$k]['data'][] = $v1;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -115,7 +120,7 @@ class Data
|
|
|
$module['id'] = Dever::db('page/module')->insert($module);
|
|
|
}
|
|
|
|
|
|
- $data = array();
|
|
|
+ $result = array();
|
|
|
if ($module) {
|
|
|
if (!$module['num']) {
|
|
|
$module['num'] = 20;
|
|
@@ -139,15 +144,18 @@ class Data
|
|
|
|
|
|
if ($data) {
|
|
|
foreach ($data as $k => $v) {
|
|
|
- $data[$k] = $this->getOne($v, $module, $cdate);
|
|
|
+ $v = $this->getOne($v, $module, $cdate);
|
|
|
+ if ($v) {
|
|
|
+ $result[] = $v;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- $data = $module;
|
|
|
+ $result = $module;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return $data;
|
|
|
+ return $result;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -165,6 +173,9 @@ class Data
|
|
|
$method = $func['api'];
|
|
|
$col = Dever::array_decode($func['col']);
|
|
|
$source = Dever::load($method, $data['type_id']);
|
|
|
+ if (!$source) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
} else {
|
|
|
$data['type_id'] = $func['api'];
|
|
|
}
|