From 2dad58eb94e729b2efd51ebac7fcc773aca80ded Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 03 Apr 2024 14:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/common/param/CommonParamSet.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/common/param/CommonParamSet.java b/src/main/java/org/springblade/common/param/CommonParamSet.java
index 917d8f9..11bc9e7 100644
--- a/src/main/java/org/springblade/common/param/CommonParamSet.java
+++ b/src/main/java/org/springblade/common/param/CommonParamSet.java
@@ -22,7 +22,7 @@
/**
* 区域编号集合
*/
- private List<String> regionChildCodesList;
+ private List<String> regionChildCodesList = new ArrayList<>();
/**
* 是否为超级管理员
*/
@@ -30,7 +30,7 @@
/**
* 网格编号集合
*/
- private List<String> gridCodeList;
+ private List<String> gridCodeList = new ArrayList<>();
public List<String> getRegionChildCodesList() {
return regionChildCodesList;
@@ -73,18 +73,23 @@
}
if (isAdministrator == 2) {
- // 获取当前用户的所属行政区划编号（）
- regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ if (!Strings.isBlank(communityCode)) {
+ // 请求头带了后直接使用过滤
+ regionChildCodesList.add(communityCode);
+ }else {
+ // 获取当前用户的所属行政区划编号（）
+ regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(), communityCode);
+ // 民警角色
+ if (!Strings.isBlank(roleName) && roleName.equals("mj")) {
+ regionChildCodesList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),communityCode);
+ }
+ }
// 获取网格编号集合
gridCodeList = new ArrayList<>();
if (!Strings.isBlank(roleName)) {
// 设置角色别名
roleNameField.setAccessible(true);
roleNameField.set(t, roleName);
- // 民警角色
- if (roleName.equals("mj")) {
- regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
- }
// 网格员角色
if (roleName.equals("wgy")) {
gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
--
Gitblit v1.9.3