diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index dbf9840ee..9accd920e 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -132,7 +132,6 @@ class SystemController extends AbstractController $setting['auto_archived'] = $setting['auto_archived'] ?: 'close'; $setting['archived_day'] = floatval($setting['archived_day']) ?: 7; $setting['task_visible'] = $setting['task_visible'] ?: 'close'; - $setting['task_default_time'] = $setting['task_default_time'] ? Base::json2array($setting['task_default_time']) : ['09:00', '18:00']; $setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open'; $setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes'; $setting['user_private_chat_mute'] = $setting['user_private_chat_mute'] ?: 'open'; diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 1fad0529f..ae9b2e582 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Module\Base; +use App\Module\Timer; /** * App\Models\Setting @@ -46,6 +47,9 @@ class Setting extends AbstractModel switch ($this->name) { case 'system': $value['system_alias'] = $value['system_alias'] ?: env('APP_NAME'); + if (!is_array($value['task_default_time']) || count($value['task_default_time']) != 2 || !Timer::isTime($value['task_default_time'][0]) || !Timer::isTime($value['task_default_time'][1])) { + $value['task_default_time'] = ['09:00', '18:00']; + } break; case 'fileSetting': $value['permission_pack_type'] = $value['permission_pack_type'] ?: 'all'; diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index ba69e5206..5b573e460 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -500,6 +500,13 @@ +