From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/common/cache/SysCache.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/common/cache/SysCache.java b/src/main/java/org/springblade/common/cache/SysCache.java
index c98fa56..d816792 100644
--- a/src/main/java/org/springblade/common/cache/SysCache.java
+++ b/src/main/java/org/springblade/common/cache/SysCache.java
@@ -25,6 +25,7 @@
import org.springblade.modules.system.service.*;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -326,13 +327,29 @@
* @return regionCode
*/
public static List<String> getRegionChildCodesByDeptId(String deptId) {
- List<String> list = new ArrayList<>();
- // 查询对应的区域编号code
- Dept dept = deptService.getById(deptId);
- if (null!=dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()){
- list = getRegionChildCodes(dept.getRegionCode());
- }
- return list;
+ //多个部门按逗号分割
+ List<String> deptIdList = Arrays.asList(deptId.split(","));
+
+ //所有行政区划code
+ List<String> allRegionList = new ArrayList<>();
+ deptIdList.forEach(id->{
+
+ List<String> list = new ArrayList<>();
+ // 查询对应的区域编号code
+ Dept dept = deptService.getById(id);
+ if (null!=dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()){
+ list = getRegionChildCodes(dept.getRegionCode());
+
+ //行政区划不为空添加进集合
+ if (list.size()>0){
+ allRegionList.addAll(list);
+ }
+ }
+ });
+
+ // 去重
+ List<String> collect = allRegionList.stream().distinct().collect(Collectors.toList());
+ return collect;
}
/**
@@ -345,14 +362,14 @@
return null;
}
List<String> regionCodeList = CacheUtil.get(SYS_CACHE, REGION_CHILDCODES_CODE, regionCode, List.class);
- if (regionCodeList == null) {
+ if (regionCodeList == null || regionCodeList.size()==0) {
regionCodeList = new ArrayList<>();
List<Region> deptChild = getRegionChild(regionCode);
if (deptChild != null) {
List<String> collect = deptChild.stream().map(Region::getCode).collect(Collectors.toList());
regionCodeList.addAll(collect);
}
-// regionCodeList.add(regionCode);
+ regionCodeList.add(regionCode);
CacheUtil.put(SYS_CACHE, REGION_CHILDCODES_CODE, regionCode, regionCodeList);
}
return regionCodeList;
--
Gitblit v1.9.3