From 6bfed4f836b17a93d32b848f23f9f4007edf982d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 5 Jan 2024 09:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 97c5500c..0048b4e2 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -373,7 +373,11 @@ class Auth extends BaseController
             if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
                 $data['is_wsxx'] = 1;
             }
-            $data['mer_info'] = array_merge($mer_arr,$bank_info);
+            if($bank_info){
+                $data['mer_info'] = array_merge($mer_arr,$bank_info);
+            }else{
+                $data['mer_info'] =$mer_arr;
+            }
             $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code');
             $data['mer_info']['type_code'] = $typCode;
             $data['mer_info']['setting_status'] = 0;