From 0d25b820878da4ccc6110231ae9193d17ebef053 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 01 七月 2024 15:21:02 +0800
Subject: [PATCH] update 优化 isTenantAdmin 空校验
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
index 8e5af46..0f4235c 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import lombok.AccessLevel;
@@ -35,6 +36,7 @@
public static final String USER_NAME_KEY = "userName";
public static final String DEPT_KEY = "deptId";
public static final String DEPT_NAME_KEY = "deptName";
+ public static final String DEPT_CATEGORY_KEY = "deptCategory";
public static final String CLIENT_KEY = "clientid";
/**
@@ -52,6 +54,7 @@
.setExtra(USER_NAME_KEY, loginUser.getUsername())
.setExtra(DEPT_KEY, loginUser.getDeptId())
.setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
+ .setExtra(DEPT_CATEGORY_KEY, loginUser.getDeptCategory())
);
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
@@ -86,6 +89,13 @@
}
/**
+ * 鑾峰彇鐢ㄦ埛璐︽埛
+ */
+ public static String getUsername() {
+ return Convert.toStr(getExtra(USER_NAME_KEY));
+ }
+
+ /**
* 鑾峰彇绉熸埛ID
*/
public static String getTenantId() {
@@ -100,6 +110,20 @@
}
/**
+ * 鑾峰彇閮ㄩ棬鍚�
+ */
+ public static String getDeptName() {
+ return Convert.toStr(getExtra(DEPT_NAME_KEY));
+ }
+
+ /**
+ * 鑾峰彇閮ㄩ棬绫诲埆缂栫爜
+ */
+ public static String getDeptCategory() {
+ return Convert.toStr(getExtra(DEPT_CATEGORY_KEY));
+ }
+
+ /**
* 鑾峰彇褰撳墠 Token 鐨勬墿灞曚俊鎭�
*
* @param key 閿��
@@ -111,13 +135,6 @@
} catch (Exception e) {
return null;
}
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛璐︽埛
- */
- public static String getUsername() {
- return getLoginUser().getUsername();
}
/**
@@ -154,6 +171,9 @@
* @return 缁撴灉
*/
public static boolean isTenantAdmin(Set<String> rolePermission) {
+ if (CollUtil.isEmpty(rolePermission)) {
+ return false;
+ }
return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY);
}
--
Gitblit v1.9.3