From 3848c5677aefdb201c24d615a7c2ad03fd5154e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
index d3130fd..18ab60d 100644
--- a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
@@ -44,6 +44,11 @@
* */
public static Integer getUnitId() {
try {
+ if (isAdmin(getUserId())) {
+ return null;
+ } else if (hasRole("zg_city")) {
+ return null;
+ }
return getLoginUser().getUser().getUnitId();
}
catch (Exception e)
--
Gitblit v1.8.0