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 49c13533a..7da6cfaa3 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 @@ -64,7 +64,7 @@ public class MyStpLogic { * @param loginType 登录类型 * @param isAdmin 是否管理员 */ - public void switchTo(Long id, String account, Long shopId, String shopName, LoginType loginType, boolean isAdmin) { + public void switchTo(boolean isMain, Long id, String account, Long shopId, String shopName, LoginType loginType, boolean isAdmin) { StpLogic logic = getLogic(); long headId = logic.getLoginIdAsLong(); @@ -75,7 +75,7 @@ public class MyStpLogic { session = logic.getSession(); } Object parentId1 = session.get("headId"); - if (parentId1 == null) { + if (!isMain && parentId1 == null) { session.set("headId", headId); } session.set("userId", id).set("isAdmin", isAdmin).set("isManager", loginType.equals(LoginType.MANAGER))