diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index adcd53a85..294624933 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -23,11 +23,14 @@ import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.controller.system.vo.*;
+import com.ruoyi.xkt.domain.Store;
 import com.ruoyi.xkt.manager.TencentAuthManager;
+import com.ruoyi.xkt.mapper.StoreMapper;
 import com.ruoyi.xkt.service.IStoreService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -65,6 +68,8 @@ public class SysLoginController {
     private TencentAuthManager tencentAuthManager;
     @Autowired
     private SysPasswordService passwordService;
+    @Autowired
+    private StoreMapper storeMapper;
 
     /**
      * 登录方法
@@ -318,8 +323,10 @@ public class SysLoginController {
                 Long storeId = roleInfoVO.getRelStoreId();
                 vo.setCurrentStoreId(storeId);
                 if (storeId != null) {
+                    Store store = this.storeMapper.selectById(storeId);
+                    vo.setCurrentStoreName(ObjectUtils.isNotEmpty(store) ? store.getStoreName() : "");
                     //档口状态
-                    vo.setCurrentStoreStatus(storeService.getStoreStatus(storeId));
+                    vo.setCurrentStoreStatus(ObjectUtils.isNotEmpty(store) ? store.getStoreStatus() : null);
                 }
             }
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java
index b3950dc8d..95ed32d38 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java
@@ -28,6 +28,9 @@ public class UserLoginInfoVO extends UserInfoVO {
     @ApiModelProperty("当前档口ID")
     private Long currentStoreId;
 
+    @ApiModelProperty("当前档口名称")
+    private String currentStoreName;
+
     @ApiModelProperty("当前档口状态[1:待审核 2:审核驳回 3:试用期 4:正式使用 5:强制清退 null:未认证]")
     private Integer currentStoreStatus;