From 8bbcf203caac16c26ef879e0d85ceed1c6f061f4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jan 2024 10:21:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/common/cache/SysCache.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..377fb23 100644
--- a/src/main/java/org/springblade/common/cache/SysCache.java
+++ b/src/main/java/org/springblade/common/cache/SysCache.java
@@ -345,14 +345,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