修改新注册用户

app/Model/UserModel.php

@@ -246,7 +246,6 @@ class UserModel extends Authenticatable
 
                 $userInfo = json_decode($result,true);
 
-
                 if (empty($userInfo['data'])){
                     LogModel::addlog(["获取用户信息失败",$request->all()]);
                     throw new \Exception("获取用户信息失败");
@@ -255,14 +254,15 @@ class UserModel extends Authenticatable
                 $userInfo = $userInfo['data'];
 
                 $userid = $userInfo['userId'];
-                $result = self::getUserPrivilege($request,['mis_uid'=>$userid]);
+                //$result = self::getUserPrivilege($request,['mis_uid'=>$userid]);
 
 
                 if (empty($user)){
 
+
                     //杨帆-yf18512-yf60144-8086
                     $data_arr = [
-                        'name'      => $userInfo['realname'].'-'.$userInfo['new_username'].'-'.$userInfo['username'].'-'.$userid,
+                        'name'      => $userInfo['nickName'].'-'.$userInfo['userId'],
                         'password'  => md5($password),
                         'organization_id'   => 0,
                         'status'    => 0,
@@ -289,7 +289,7 @@ class UserModel extends Authenticatable
 
             }else{
 
-                $result = self::getUserPrivilege($request,['mis_uid'=>$user->mis_uid]);
+                //$result = self::getUserPrivilege($request,['mis_uid'=>$user->mis_uid]);
 
                 if ($user['password'] != md5($password)){
                     throw new \Exception("用户名称或者密码错误");
@@ -305,6 +305,11 @@ class UserModel extends Authenticatable
 
             }
 
+            $result = self::getUserPrivilege($request,['mis_uid'=>$userid]);
+            if (empty($result)){
+                LogModel::addlog(["暂无业务权限，请联系管理员",$request->all()]);
+                throw new \Exception('暂无业务权限，请联系管理员',403);
+            }
 
 
             $token = generateRandomNum();
@@ -361,16 +366,13 @@ class UserModel extends Authenticatable
                     $data
                 );
 
+
                 $privilege = json_decode($result,true);
 
                 if (!empty($privilege['data'])){
                     array_push($tmp,$catg);
                 }
-            }
 
-            if (empty($tmp)){
-                LogModel::addlog(["暂无业务权限，请联系管理员",$request->all()]);
-                throw new \Exception('暂无业务权限，请联系管理员',403);
             }
 
         }catch (\Exception $exception){