From e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 15:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/common/utils/SecurityUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index dc46ef1..97742ee 100644
--- a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -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