From 624fd877511d04a776e35a0198d2d416ce6ddfdb Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期四, 16 五月 2024 17:52:16 +0800
Subject: [PATCH] update 优化部门类别编码获取
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 058dee7..1e0d8a7 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
@@ -35,6 +35,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,10 +53,9 @@
.setExtra(USER_NAME_KEY, loginUser.getUsername())
.setExtra(DEPT_KEY, loginUser.getDeptId())
.setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
+ .setExtra(DEPT_CATEGORY_KEY, loginUser.getDeptCategory())
);
- SaSession tokenSession = StpUtil.getTokenSession();
- tokenSession.updateTimeout(model.getTimeout());
- tokenSession.set(LOGIN_USER_KEY, loginUser);
+ StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
/**
@@ -101,13 +101,32 @@
return Convert.toLong(getExtra(DEPT_KEY));
}
+ /**
+ * 鑾峰彇閮ㄩ棬鍚�
+ */
+ 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 閿��
+ * @return 瀵瑰簲鐨勬墿灞曟暟鎹�
+ */
private static Object getExtra(String key) {
try {
return StpUtil.getExtra(key);
} catch (Exception e) {
return null;
}
-
}
/**
@@ -135,12 +154,17 @@
return UserConstants.SUPER_ADMIN_ID.equals(userId);
}
+ /**
+ * 鏄惁涓鸿秴绾х鐞嗗憳
+ *
+ * @return 缁撴灉
+ */
public static boolean isSuperAdmin() {
return isSuperAdmin(getUserId());
}
/**
- * 鏄惁涓鸿秴绾х鐞嗗憳
+ * 鏄惁涓虹鎴风鐞嗗憳
*
* @param rolePermission 瑙掕壊鏉冮檺鏍囪瘑缁�
* @return 缁撴灉
@@ -149,10 +173,20 @@
return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY);
}
+ /**
+ * 鏄惁涓虹鎴风鐞嗗憳
+ *
+ * @return 缁撴灉
+ */
public static boolean isTenantAdmin() {
return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission()));
}
+ /**
+ * 妫�鏌ュ綋鍓嶇敤鎴锋槸鍚﹀凡鐧诲綍
+ *
+ * @return 缁撴灉
+ */
public static boolean isLogin() {
return getLoginUser() != null;
}
--
Gitblit v1.9.3