Merge remote-tracking branch 'origin/develop' into develop

2025-12-16 16:14:32 +08:00
parent cda159929c 375867a2ea
commit 4ccee5f8ac
1 changed files with 1 additions and 1 deletions
--- a/application/api/model/UserToken.php
+++ b/application/api/model/UserToken.php
@@ -22,7 +22,7 @@ class UserToken extends Model

        $block1 = db::name('block')->where(['type' => 1,'type_text' => $user_token['user_id']])->find();
        $userState  = db::name('user')->where(['id' => $user_token['user_id']])->value('status');
-        if(isset($block1) &&  $userState == 2){
+        if(isset($block1) ||  $userState == 2){
            return ['code' => 204, 'msg'=> '账号已被封禁，请联系管理员','data' => null];
        }
        $login_device = request()->header('deviceId');