|
|
@@ -421,11 +421,8 @@ class AuthController extends PublicController
|
|
|
}
|
|
|
$adminId = $admin['id'];
|
|
|
$shopAdmin = ShopAdminService::getByCondition(['adminId' => $adminId, 'delStatus' => 0]);
|
|
|
- if ($shopAdmin['status'] == 0) {
|
|
|
- util::fail("您的账号还未激活");
|
|
|
- }
|
|
|
- $sjId = isset($shopAdmin['sjId']) ? $shopAdmin['sjId'] : 0;
|
|
|
- $shopId = $shopAdmin['currentGhsShopId'] ?? 0;
|
|
|
+ $sjId = $shopAdmin['sjId'] ?? 0;
|
|
|
+ $shopId = $admin['currentGhsShopId'] ?? 0;
|
|
|
if (empty($shopId)) {
|
|
|
util::fail('没有权限登录');
|
|
|
}
|
