From a323e2baff690d9386af66c47a91b4cafb5d5b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= Date: Fri, 18 Dec 2020 14:30:00 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20#106=20=E5=89=8D=E5=8F=B0=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E7=A0=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20&=20?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8[=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8]=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=BC=80=E5=85=B3=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/LogsController.php | 4 ++-- app/Http/Controllers/AuthController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/LogsController.php b/app/Http/Controllers/Admin/LogsController.php index b5526eeb..b5d2047e 100644 --- a/app/Http/Controllers/Admin/LogsController.php +++ b/app/Http/Controllers/Admin/LogsController.php @@ -45,9 +45,9 @@ class LogsController extends Controller if (isset($is_coupon)) { if ($is_coupon) { - $query->where('coupon_id', '<>', 0); + $query->where('coupon_id', '<>', null); } else { - $query->whereCouponId(0); + $query->whereCouponId(null); } } diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index ed7d3fe4..23c51559 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -711,7 +711,7 @@ class AuthController extends Controller } // 是否开启注册发送验证码 - if (sysConfig('is_activate_account') != 1) { + if ((int) sysConfig('is_activate_account') !== 1) { return Response::json(['status' => 'fail', 'message' => trans('auth.captcha_close')]); } @@ -744,7 +744,7 @@ class AuthController extends Controller // 公开的邀请码列表 public function free() { - $view['inviteList'] = Invite::whereInviterId(0)->whereStatus(0)->paginate(); + $view['inviteList'] = Invite::whereInviterId(null)->whereStatus(0)->paginate(); return view('auth.free', $view); }