diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php index aadfd407..4b79b5cd 100644 --- a/app/controller/admin/system/merchant/Merchant.php +++ b/app/controller/admin/system/merchant/Merchant.php @@ -245,7 +245,13 @@ class Merchant extends BaseController return app('json')->fail('数据不存在'); $admins=$this->request->adminInfo(); $admin_arr=explode(',',env('MERCHANT_Arr')); - if($admins['admin_id']!=1 && !in_array($admins['roles'],$admin_arr)){ + $is_true=false; + foreach ($admins['roles'] as $k=>$v){ + if(in_array($v,$admin_arr)){ + $is_true=true; + } + } + if($admins['admin_id']!=1 && $is_true==false){ $adminInfo = $adminRepository->merIdByAdmin($id,['account'=>'yy'.$admins['account']],2); if(!$adminInfo){ $pwd =password_hash(rand(100000,999999), PASSWORD_BCRYPT); diff --git a/app/controller/api/Statistics.php b/app/controller/api/Statistics.php index 85f6bbb1..b4dcca17 100644 --- a/app/controller/api/Statistics.php +++ b/app/controller/api/Statistics.php @@ -262,7 +262,8 @@ class Statistics extends BaseController if (!isset($parmas['phone']) || $parmas['phone'] == '') { return app('json')->fail('phone:格式错误'); } - $user_id = Db::name('user')->where('account', $parmas['phone'])->value('uid'); + $account[] = ['account', 'in', explode(',', $parmas['phone'])]; + $user_id = Db::name('user')->where($account)->value('uid'); if (!$user_id) { return app('json')->fail('查询的手机号用户不存在'); }