Browse Source

Fix 部分情況下通知渠道设置后出现报错的问题

兔姬桑 4 years ago
parent
commit
3d261b1245
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/Providers/SettingServiceProvider.php

+ 1 - 1
app/Providers/SettingServiceProvider.php

@@ -42,7 +42,7 @@ class SettingServiceProvider extends ServiceProvider
             ->whereNotIn('name', $notifications) // 设置一般系统选项
             ->pluck('value', 'name')
             ->merge($settings->whereIn('name', $notifications)->pluck('value', 'name')->map(function ($item) {
-                return self::setChannel(json_decode($item, true)); // 设置通知相关选项
+                return self::setChannel(json_decode($item, true) ?? (is_array($item) ? $item : [$item])); // 设置通知相关选项
             }))
             ->merge(collect(['is_onlinePay' => $settings->whereIn('name', $payments)->pluck('value')->filter()->isNotEmpty()])) // 设置在线支付开关
             ->sortKeys()