From 2971356597b7a973065e24b485ebdf6104872d34 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, 12 Feb 2025 17:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0userId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/sa/MyStpLogic.java         | 12 ++++++++----
 .../service/impl/AuthorizationServiceImpl.java       |  1 -
 2 files changed, 8 insertions(+), 5 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 5595a0fc..a1f81dd1 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
@@ -1,10 +1,8 @@
 package com.czg.sa;
 
-import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpLogic;
 import com.czg.exception.ApiNotPrintException;
 import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 
@@ -13,8 +11,6 @@ import java.util.List;
  */
 @Getter
 public class MyStpLogic extends StpLogic {
-    @Setter
-    private boolean isAdmin;
 
 
     /**
@@ -38,6 +34,14 @@ public class MyStpLogic extends StpLogic {
         return (Long) object;
     }
 
+    /**
+     * 是否为管理员
+     * @return 布尔值
+     */
+    public boolean isAdmin() {
+        Object object = StpKit.ADMIN.getSession().get("isAdmin");
+        return object instanceof Boolean t && t;
+    }
 
     /**
      * 添加当前账号的角色
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
index ebe9830b..5340e6c7 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
@@ -102,7 +102,6 @@ public class AuthorizationServiceImpl implements AuthorizationService {
 
         StpKit.ADMIN.login(user.getId());
         StpKit.ADMIN.getSession().set("userId", user.getId()).set("shopId", shopInfo.getId()).set("isAdmin", user.getIsAdmin());
-        StpKit.ADMIN.setAdmin(user.getIsAdmin());
         // 查询角色
         List<SysRole> roleList = sysRoleService.getByUserId(user.getId());
         List<String> roleNames = roleList.stream().map(SysRole::getName).collect(Collectors.toList());