From 727c30f11ede5b3c82ead6e09e5e077c0e7519f1 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期三, 05 二月 2025 13:02:21 +0800 Subject: [PATCH] Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas 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