diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
index 31aaa944..cb8fc24e 100644
--- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
+++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
@@ -11,6 +11,7 @@ import cn.dev33.satoken.session.TokenSign;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
+import cn.hutool.core.util.StrUtil;
 import com.czg.exception.ApiNotPrintException;
 import lombok.Getter;
 
@@ -84,7 +85,7 @@ public class MyStpLogic {
             errType = 0;
         } else {
             String header = SaHolder.getRequest().getHeader("shopId");
-            shopId = header == null ? null : Long.parseLong(header);
+            shopId = StrUtil.isBlank(header) ? null : Long.parseLong(header);
             errType = 1;
         }
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java
index 9c0751cd..1d9614ef 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopExtendServiceImpl.java
@@ -43,7 +43,7 @@ public class ShopExtendServiceImpl extends ServiceImpl<ShopExtendMapper, ShopExt
 
     @Override
     public List<ShopExtend> listInfo(Long shopId, String autoKey) {
-        QueryWrapper queryWrapper = new QueryWrapper().eq(ShopExtend::getShopId, StpKit.USER.getShopId());
+        QueryWrapper queryWrapper = new QueryWrapper().eq(ShopExtend::getShopId, shopId);
         if (StrUtil.isNotBlank(autoKey)) {
             queryWrapper.eq(ShopExtend::getAutoKey, autoKey);
         }