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 roleList = sysRoleService.getByUserId(user.getId()); List roleNames = roleList.stream().map(SysRole::getName).collect(Collectors.toList());