|
@@ -804,6 +804,12 @@ class Base {
|
|
|
foreach ($values as $key => $value) {
|
|
|
$property = $this->entity()->convertToProperty($key);
|
|
|
if($this->hasProperty($key)) {
|
|
|
+ if(is_array($value)) {
|
|
|
+ $value = json_encode($value, JSON_UNESCAPED_UNICODE);
|
|
|
+ }
|
|
|
+ if(is_object($value)) {
|
|
|
+ $value = serialize($value);
|
|
|
+ }
|
|
|
$this->$property = $value;
|
|
|
}
|
|
|
}
|
|
@@ -1838,7 +1844,7 @@ class Base {
|
|
|
$data['pages']['total'] = (int) ($count ? $count : 0);
|
|
|
$data['pages']['currentPage'] = $page;
|
|
|
$data['pages']['totalPage'] = ceil($data['pages']['total'] / $pageSize);
|
|
|
- $data['lists'] = array();
|
|
|
+ $data['lists'] = isset($data['lists']) ? $data['lists'] : array();
|
|
|
if ($data['pages']['currentPage'] > $data['pages']['totalPage']) {
|
|
|
return false;
|
|
|
}
|
|
@@ -1861,6 +1867,7 @@ class Base {
|
|
|
$data['pages']['pagination'] = $pagination;
|
|
|
$data['pages']['limitStart'] = (min($page, $data['pages']['totalPage']) - 1) * $pageSize;
|
|
|
$data['pages']['pageSize'] = (int) $pageSize;
|
|
|
+
|
|
|
return true;
|
|
|
}
|
|
|
/**
|