From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/common/cache/SysCache.java | 62 +++++++++++++------------------
1 files changed, 26 insertions(+), 36 deletions(-)
diff --git a/src/main/java/org/springblade/common/cache/SysCache.java b/src/main/java/org/springblade/common/cache/SysCache.java
index a9a2e64..d58137b 100644
--- a/src/main/java/org/springblade/common/cache/SysCache.java
+++ b/src/main/java/org/springblade/common/cache/SysCache.java
@@ -1,19 +1,3 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.common.cache;
import org.apache.logging.log4j.util.Strings;
@@ -364,27 +348,33 @@
* @return regionCode
*/
public static List<String> getPoliceRegionChildCodesByDeptId(String deptId) {
- //多个部门按逗号分割
- 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 = getPoliceRegionChildCodes(dept.getRegionCode());
- //行政区划不为空添加进集合
- if (list.size()>0){
- allRegionList.addAll(list);
- }
- }
- });
-
// 去重
- List<String> collect = allRegionList.stream().distinct().collect(Collectors.toList());
- return collect;
+ List<String> regionCodeList = new ArrayList<>();
+ if (!Strings.isBlank(deptId)) {
+ //多个部门按逗号分割
+ 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 (dept.getDeptNature() == 1) {
+ if (null != dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()) {
+ list = getPoliceRegionChildCodes(dept.getRegionCode());
+ //行政区划不为空添加进集合
+ if (list.size() > 0) {
+ allRegionList.addAll(list);
+ }
+ }
+ }
+ });
+ // 去重
+ regionCodeList = allRegionList.stream().distinct().collect(Collectors.toList());
+ }
+ return regionCodeList;
}
/**
--
Gitblit v1.9.3