Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/common/cache/SysCache.java

@@ -373,11 +373,14 @@
         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);
         // 只取公安的
         if (dept.getDeptNature()==1) {
            if (null != dept && !Strings.isBlank(dept.getRegionCode()) && !AuthUtil.isAdministrator()) {
               list = getPoliceRegionChildCodes(dept.getRegionCode());
               //行政区划不为空添加进集合
               if (list.size() > 0) {
                  allRegionList.addAll(list);
               }
            }
         }
      });