From 92a3b953f2da493e68afb9ae73a15b6513a6c18a Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 28 Feb 2024 17:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/common/param/CommonParamSet.java | 18 +++++++++++++++++-
1 files changed, 17 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 e76904b..b8875b6 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -5,6 +5,7 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.service.IRegionService;
@@ -12,6 +13,8 @@
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+
+import static org.springblade.core.secure.utils.AuthUtil.getUserRole;
public class CommonParamSet<T> {
/**
@@ -57,7 +60,12 @@
communityCodeField.set(t,communityCode);
}
}
- isAdministrator = Strings.isBlank(roleName) && (AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true) ? 1 : 2;
+ // 超级管理员、系统管理员、公安管理员不过滤数据
+ isAdministrator = Strings.isBlank(roleName) &&
+ (AuthUtil.isAdministrator() == true ||
+ AuthUtil.isAdmin() == true ||
+ isGaAdmin() == true
+ ) ? 1 : 2;
if (isAdministrator==2) {
// 获取当前用户的所属行政区划编号（）
regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
@@ -88,4 +96,12 @@
}
return this;
}
+
+ /**
+ * 是否为公安管理员
+ * @return
+ */
+ public boolean isGaAdmin() {
+ return StringUtil.containsAny(getUserRole(), new CharSequence[]{"gagly"});
+ }
}
--
Gitblit v1.9.3