From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index 48bcc09..5bbcbc4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -40,7 +40,11 @@
**/
public static String getDeptDistrictCode() {
try {
- return getLoginUser().getUser().getDept().getDistrictCode();
+ if (getLoginUser().getUser().getDept() == null) {
+ return "";
+ }
+ String districtCode = getLoginUser().getUser().getDept().getDistrictCode();
+ return StringUtils.isEmpty(districtCode) ? "" : districtCode;
} catch (Exception e) {
throw new ServiceException("获取部门区域异常", HttpStatus.UNAUTHORIZED);
}
--
Gitblit v1.9.2