|
@@ -151,9 +151,10 @@ class LoginController extends Controller
|
|
|
// ->where('PhoneNum', $Phone)
|
|
// ->where('PhoneNum', $Phone)
|
|
|
//// ->where('Channel', $user->Channel)
|
|
//// ->where('Channel', $user->Channel)
|
|
|
// ->orWhere('UserID', $user->UserID)
|
|
// ->orWhere('UserID', $user->UserID)
|
|
|
|
|
+
|
|
|
$first = GlobalUserInfo::query()->where(function ($query) use ($Phone, $user, $config) {
|
|
$first = GlobalUserInfo::query()->where(function ($query) use ($Phone, $user, $config) {
|
|
|
- $query->where(function ($q) use ($Phone, $config) {
|
|
|
|
|
- $q->where('RegionID', $config->isRegionUnique())->where('Phone', $Phone);
|
|
|
|
|
|
|
+ $query->where(function ($q) use ($Phone, $user) {
|
|
|
|
|
+ $q->where('RegionID', $user->RegionID??"")->where('Phone', $Phone);
|
|
|
})->orWhere(function ($q) use ($user) {
|
|
})->orWhere(function ($q) use ($user) {
|
|
|
$q->where('UserID', $user->UserID)->where('Phone', '<>', '');
|
|
$q->where('UserID', $user->UserID)->where('Phone', '<>', '');
|
|
|
});
|
|
});
|