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 b0fdfa027..b9f1db812 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
@@ -302,7 +302,7 @@ public class SysLoginController {
         UserInfo infoDTO = userService.getUserById(loginUser.getUserId());
         for (RoleInfo roleInfo : CollUtil.emptyIfNull(infoDTO.getRoles())) {
             if (roleInfo.getRoleId().equals(vo.getRoleId())
-                    && roleInfo.getRelStoreId().equals(vo.getRelStoreId())) {
+                    && Objects.equals(roleInfo.getRelStoreId(), vo.getRelStoreId())) {
                 //切换
                 loginUser.setCurrentRoleId(roleInfo.getRoleId());
                 loginUser.setCurrentStoreId(roleInfo.getRelStoreId());