xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish Hotfix-1

Browse Source
This commit is contained in:
mzl
2025-08-21 14:31:59 +08:00
parent 60dcc3399f d41fc55e61
commit 5f88f8687d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/logic/AuthLogic.php
+14 -6
View File
@@ -87,13 +87,21 @@ class AuthLogic
try { try {
$phone = $this->sanitizePhone($feishuUserInfo['mobile'] ?? ''); $phone = $this->sanitizePhone($feishuUserInfo['mobile'] ?? '');
$email = $feishuUserInfo['enterprise_email']; $email = $feishuUserInfo['enterprise_email'];
$user = User::where('corp_id', $feishuUserInfo['corp_id']) // $user = User::where('corp_id', $feishuUserInfo['corp_id'])
->where(function($query) use ($phone, $email) { // ->where(function($query) use ($phone, $email) {
$query->where('phone', $phone) // $query->where('phone', $phone)
->orWhere('email', $email); // ->orWhere('email', $email);
}) // })
// ->first();
$userByPhone = User::where('corp_id', $feishuUserInfo['corp_id'])
->where('phone', $phone)
->where('phone', '!=', '')
->first(); ->first();
$userByEmail = User::where('corp_id', $feishuUserInfo['corp_id'])
->where('email', $email)
->where('email', '!=', '')
->first();
$user = $userByPhone ?: $userByEmail;
if (!$user) { if (!$user) {
// 获取编号 // 获取编号
$userSn = $this->getAvailableUserSn(); $userSn = $this->getAvailableUserSn();