From 4fa495b3a31cff7a22ef5efff1d40eb26d5272ec Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 02 Feb 2024 14:36:44 +0800
Subject: [PATCH] getRegionChildCodesByDeptId 方法修改适配多部门
---
src/main/java/org/springblade/common/cache/SysCache.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/common/cache/SysCache.java b/src/main/java/org/springblade/common/cache/SysCache.java
index 377fb23..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;
}
/**
--
Gitblit v1.9.3