From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 a7fa84f..18ab60d 100644
--- a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
@@ -17,7 +17,7 @@
/**
* 瀹夊叏鏈嶅姟宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class SecurityUtils
@@ -35,6 +35,25 @@
catch (Exception e)
{
throw new ServiceException("鑾峰彇鐢ㄦ埛ID寮傚父", HttpStatus.UNAUTHORIZED);
+ }
+ }
+
+ /**
+ * 鑾峰彇杩愮淮鍗曚綅ID
+ *
+ * */
+ public static Integer getUnitId() {
+ try {
+ if (isAdmin(getUserId())) {
+ return null;
+ } else if (hasRole("zg_city")) {
+ return null;
+ }
+ return getLoginUser().getUser().getUnitId();
+ }
+ catch (Exception e)
+ {
+ throw new ServiceException("鑾峰彇鐢ㄦ埛鍗曚綅寮傚父", HttpStatus.UNAUTHORIZED);
}
}
@@ -118,7 +137,7 @@
/**
* 鏄惁涓虹鐞嗗憳
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
@@ -129,7 +148,7 @@
/**
* 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
- *
+ *
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
*/
@@ -140,7 +159,7 @@
/**
* 鍒ゆ柇鏄惁鍖呭惈鏉冮檺
- *
+ *
* @param authorities 鏉冮檺鍒楄〃
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
@@ -153,7 +172,7 @@
/**
* 楠岃瘉鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊
- *
+ *
* @param role 瑙掕壊鏍囪瘑
* @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹�
*/
@@ -166,7 +185,7 @@
/**
* 鍒ゆ柇鏄惁鍖呭惈瑙掕壊
- *
+ *
* @param roles 瑙掕壊鍒楄〃
* @param role 瑙掕壊
* @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹叉潈闄�
--
Gitblit v1.8.0