From 86498f43cb9e6a5f8c58cca7b5c07a5ad1e23b2f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Feb 2024 09:22:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/common/param/CommonParamSet.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/common/param/CommonParamSet.java b/src/main/java/org/springblade/common/param/CommonParamSet.java
index 52bb45d..55448d5 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -57,7 +57,7 @@
communityCodeField.set(t,communityCode);
}
}
- isAdministrator = AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true ? 1 : 2;
+ isAdministrator = Strings.isBlank(roleName) && (AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true) ? 1 : 2;
if (isAdministrator==2) {
// 获取当前用户的所属行政区划编号
regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
--
Gitblit v1.9.3