diff --git a/server/app/common.php b/server/app/common.php index deb4deb0832c031e79452bb6df6f648fdabcfc35..37c71bf19eef6a5c55dd0351426865102b3d5fac 100644 --- a/server/app/common.php +++ b/server/app/common.php @@ -208,6 +208,9 @@ function clear_file_domain($content) */ function get_file_domain($content) { + if (empty($content)){ + return $content; + } $preg = '/()/is'; $fileUrl = FileService::getFileUrl(); return preg_replace($preg, "\${1}$fileUrl\${2}\${3}", $content); diff --git a/server/app/common/lists/BaseDataLists.php b/server/app/common/lists/BaseDataLists.php index bebf81c2e7e01a37b491fc3057a0bff75a328f7a..ce7839f95b404cd49812ce00c9a4cbf84a0a39fd 100644 --- a/server/app/common/lists/BaseDataLists.php +++ b/server/app/common/lists/BaseDataLists.php @@ -120,10 +120,13 @@ abstract class BaseDataLists implements ListsInterface return []; } $startTime = $this->request->get('start_time'); - $this->startTime = strtotime($startTime); + if ($startTime){ + $this->startTime = strtotime($startTime); + } $endTime = $this->request->get('end_time'); - $this->endTime = strtotime($endTime); - + if($endTime){ + $this->endTime = strtotime($endTime); + } $this->start = $this->request->get('start'); $this->end = $this->request->get('end');