Merge branch 'feature/main20240421' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong into feature/main20240421

8 months ago · 7590283c78
parent dca688ca7d 31b3069143
commit 7590283c78
1 changed files with 1 additions and 1 deletions
--- a/app/store/controller/Controller.php
+++ b/app/store/controller/Controller.php
@ -159,7 +159,7 @@ class Controller extends BaseController
        $this->merchantId = 0;
        $user = StoreUserService::getLoginInfo();
        if (!empty($user)) {
-            if ($user['user']['store']['store_version']) {
+            if (isset($user['user']['store']['store_version']) && $user['user']['store']['store_version']) {
                $this->merchantId = MerchantModel::getMerchantId($user['user']['user_name']);
            }
        }