From 8e89f95b9db4039f0cb8b4b8dc7974c247366c4c Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 21 五月 2026 15:14:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index 009384f..97742ee 100644
--- a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -38,11 +38,11 @@
/**
* 鑾峰彇閮ㄩ棬ID
**/
- public static Long getDeptId()
+ public static Long [] getDeptId()
{
try
{
- return getLoginUser().getDeptId();
+ return getLoginUser().getDeptIds();
}
catch (Exception e)
{
@@ -121,7 +121,7 @@
*/
public static boolean isAdmin(Long userId)
{
- return userId != null && 1L == userId;
+ return hasRole("鏅��2") ||hasRole("admin") || hasRole("鏈�楂�1");
}
/**
--
Gitblit v1.9.3