dyjh 6 年 前
コミット
e92ac5156e
1 ファイル変更6 行追加1 行削除
  1. 6 1
      app/Http/Controllers/Api/V1/AlbumController.php

+ 6 - 1
app/Http/Controllers/Api/V1/AlbumController.php

xqd
@@ -148,7 +148,12 @@ class AlbumController extends Controller
 
         $session = $res['session_key'];
         $decryptedData = $app->encryptor->decryptData($session, $datas['iv'], $datas['encryptData']);
-            $check = AlbumUserModel::where('wechat_union_id',$decryptedData['unionId'])->orWhere('open_id', $res['openid'])->first();
+        if (isset($decryptedData['unionId'])) {
+            $check = AlbumUserModel::where('open_id', $res['openid'])->first();
+        } else {
+            $check = AlbumUserModel::where('wechat_union_id', $decryptedData['unionId'])->first();
+        }
+
             if(!$check){
                 $add['username'] = preg_replace('/[\xf0-\xf7].{3}/', '', $datas['nickName']);
                 $add['open_id'] = $res['openid'];