Commit 51289383 by 杨昕

code format

parent 1aa21c25
Pipeline #14721 passed with stages
in 3 minutes 23 seconds
......@@ -212,13 +212,13 @@ class UserModel extends Authenticatable
try{
$password = strtolower($request->password);
$password = $request->password;
$username = $request->username;
/**
* 陈腾飞-ctf37800-ctf88614-89043
* 用户名称是有四部分组成,姓名-新账号-旧账号-mis_uid
* 陈腾飞-ctf37800-ctf88614
* 用户名称是有三部分组成,姓名-新账号-旧账号
*/
$user = UserModel::where('name', 'regexp', '/^.*?'.$username.'/')->first();
......@@ -398,7 +398,7 @@ class UserModel extends Authenticatable
$data = sign($staffNo);
$data['type'] = 6;
$data['username'] = $staffNo;*/
//第三方接口要求mis_uid是必填字段,第一次获取的时候默认传值000000
$request->replace(array_merge($request->all(),['mis_uid'=>'000000']));
$url = getRbac($request,"api/mis/userinfo",'','mis_user');
......@@ -410,7 +410,7 @@ class UserModel extends Authenticatable
$userInfo = json_decode($result,true);
if (empty($userInfo['data']['userId'])){
if (!$userInfo['data']['userId']){
LogModel::addlog(["用户不存在",$request->all()]);
throw new \Exception("用户不存在");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment