diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 05fca2f1..32b3edd6 100755 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -373,7 +373,7 @@ 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; } - if(count($bank_info)>0 && count($mer_arr)>0){ + if($bank_info && count($bank_info)>0 && count($mer_arr)>0){ $data['mer_info'] = array_merge($mer_arr,$bank_info); }else{ $data['mer_info'] =$mer_arr;