From ea1613944a1cb49bd8ac59dc6d0efd6032c9ab8c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 01 Apr 2024 14:40:44 +0800
Subject: [PATCH] e呼，用户，住户，房屋，报事报修，场所详情，从业人员等api,通用接口标注
---
src/main/java/org/springblade/common/param/CommonParamSet.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/common/param/CommonParamSet.java b/src/main/java/org/springblade/common/param/CommonParamSet.java
index ebdf008..917d8f9 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -1,5 +1,6 @@
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;
@@ -62,8 +63,14 @@
}
}
// 超级管理员、系统管理员、公安管理员不过滤数据
- isAdministrator = AuthUtils.isAdmin(roleName) || AuthUtils.isAdmin() ||
- AuthUtils.isAdministrator() || AuthUtils.isGaAdmin() ? 1 : 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) {
// 获取当前用户的所属行政区划编号（）
--
Gitblit v1.9.3