From 706b8e64d33f957be7a9ae90d0de067277c9d23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 15 Oct 2025 17:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=89=E7=A4=BC=E6=A6=82?=
 =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/sa/MyStpLogic.java             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 989f0d34..6e35d28e 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
@@ -112,10 +112,13 @@ public class MyStpLogic {
         if (shopId != null) {
             session.set("shopId", shopId);
         }
-        if (!isMainShop) {
-            session.set("headShopId", headShopId);
+
+        if (headShopId != null) {
+            if (!isMainShop) {
+                session.set("headShopId", headShopId);
+            }
+            session.set("mainShopId", headShopId);
         }
-        session.set("mainShopId", headShopId);
         if (shopName != null) {
             session.set("shopName", shopName);
         }