From fb5f44a20d7620d3862d739df360e0ef6ddc0a0a Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Wed, 9 Apr 2025 10:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=BA=97=E9=93=BA=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/ShopInfoController.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
index e2039dbc..1da42302 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
@@ -100,9 +100,18 @@ public class ShopInfoController {
     @GetMapping("branchList")
     public CzgResult<List<ShopBranchSelectDTO>> findShopBranch() {
         Long shopId = StpKit.USER.getShopId(0L);
+        String tokenValue = StpKit.USER.getTokenInfo().getTokenValue();
         Long headId = StpKit.USER.getHeadId();
         List<TokenSign> tokenSignList = StpKit.USER.getSession().getTokenSignList();
-        List<ShopBranchSelectDTO> data = shopInfoService.findShopBranch((headId != null && CollUtil.isEmpty(tokenSignList)) ? headId : shopId);
+        if (headId != null && CollUtil.isEmpty(tokenSignList)) {
+            shopId = headId;
+        } else {
+            long count = tokenSignList.stream().filter(obj -> tokenValue.equals(obj.getValue())).count();
+            if (headId != null && count == 0) {
+                shopId = headId;
+            }
+        }
+        List<ShopBranchSelectDTO> data = shopInfoService.findShopBranch(shopId);
         return CzgResult.success(data);
     }