From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/common/param/CommonParamSet.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/common/param/CommonParamSet.java b/src/main/java/org/springblade/common/param/CommonParamSet.java
index b8875b6..917d8f9 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -1,7 +1,9 @@
package org.springblade.common.param;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.utils.AuthUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -57,16 +59,20 @@
if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
// 设置社区编号
communityCodeField.setAccessible(true);
- communityCodeField.set(t,communityCode);
+ communityCodeField.set(t, communityCode);
}
}
// 超级管理员、系统管理员、公安管理员不过滤数据
- isAdministrator = Strings.isBlank(roleName) &&
- (AuthUtil.isAdministrator() == true ||
- AuthUtil.isAdmin() == true ||
- isGaAdmin() == true
- ) ? 1 : 2;
- if (isAdministrator==2) {
+// isAdministrator = AuthUtils.isAdmin(roleName) || AuthUtils.isAdmin() ||
+// AuthUtils.isAdministrator() || AuthUtils.isGaAdmin() ? 1 : 2;
+ if (StringUtils.isNotBlank(roleName)) {
+ isAdministrator = AuthUtils.isAdmin(roleName) ? 1 : 2;
+ } else {
+ isAdministrator = AuthUtils.isAdmin() ||
+ AuthUtils.isAdministrator() || AuthUtils.isGaAdmin() ? 1 : 2;
+ }
+
+ if (isAdministrator == 2) {
// 获取当前用户的所属行政区划编号（）
regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
// 获取网格编号集合
@@ -97,11 +103,5 @@
return this;
}
- /**
- * 是否为公安管理员
- * @return
- */
- public boolean isGaAdmin() {
- return StringUtil.containsAny(getUserRole(), new CharSequence[]{"gagly"});
- }
+
}
--
Gitblit v1.9.3