From 43501d34151d28ef35eba7263076834a8ea7d7f3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 01 Mar 2024 18:02:10 +0800
Subject: [PATCH] 物业公司查询的物业人人员查询
---
src/main/java/org/springblade/common/param/CommonParamSet.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/common/param/CommonParamSet.java b/src/main/java/org/springblade/common/param/CommonParamSet.java
index 55448d5..ebdf008 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -2,9 +2,11 @@
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;
+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 +14,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> {
/**
@@ -54,12 +58,15 @@
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) ? 1 : 2;
- if (isAdministrator==2) {
- // 获取当前用户的所属行政区划编号
+ // 超级管理员、系统管理员、公安管理员不过滤数据
+ isAdministrator = AuthUtils.isAdmin(roleName) || AuthUtils.isAdmin() ||
+ AuthUtils.isAdministrator() || AuthUtils.isGaAdmin() ? 1 : 2;
+
+ if (isAdministrator == 2) {
+ // 获取当前用户的所属行政区划编号（）
regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
// 获取网格编号集合
gridCodeList = new ArrayList<>();
@@ -88,4 +95,6 @@
}
return this;
}
+
+
}
--
Gitblit v1.9.3