1
This commit is contained in:
@@ -171,7 +171,7 @@ class UserController extends BaseController
|
|||||||
$result = $this->service->miniappLogin($request->all());
|
$result = $this->service->miniappLogin($request->all());
|
||||||
return $this->success($result);
|
return $this->success($result);
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
return $this->error($th->getMessage().$th->getLine().$th->getFile());
|
return $this->error($th->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -296,7 +296,9 @@ class UserService
|
|||||||
$old = UserOld::where('mobile', $mobile)->first();
|
$old = UserOld::where('mobile', $mobile)->first();
|
||||||
$uinfo = User::where('id', $request->user->uid)->first();
|
$uinfo = User::where('id', $request->user->uid)->first();
|
||||||
if ($old) {
|
if ($old) {
|
||||||
$uinfo->name = $old->name;
|
if(!empty($old->name)){
|
||||||
|
$uinfo->name = $old->name;
|
||||||
|
}
|
||||||
$uinfo->is_release = 1;
|
$uinfo->is_release = 1;
|
||||||
}
|
}
|
||||||
$uinfo->mobile = $mobile;
|
$uinfo->mobile = $mobile;
|
||||||
|
|||||||
Reference in New Issue
Block a user