Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java

@@ -17,10 +17,8 @@
package org.springblade.modules.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
@@ -46,7 +44,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.springblade.common.cache.RegionCache.*;

@@ -152,11 +149,17 @@
         }
         // 综治的需要查到网格
         if (region.getDeptNature()==2){
            region.setCityCode("361100");
            region.setCityCode("361102");
            region.setDistrictCode("361102");
         }
         // 综治的需要查到网格
         if (region.getDeptNature()==3){
            region.setDistrictCode("361102");
         }
      }
      // 非公安
      return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region, regionChildCodesList, isAdministrator));
      Map<String, TreeStringNode> treeList = baseMapper.getTreeList(region, regionChildCodesList, isAdministrator);
      return NodeTreeUtil.getStringNodeTree(treeList);
   }

   /**
@@ -330,4 +333,35 @@
      }
      return list;
   }

   /**
    * 查询当前文章范围对应的社区编号字符串集合
    * @param articleRange
    * @return
    */
   @Override
   public String getAllCommunityNameListString(String articleRange) {
      // 分割后es搜索才有效果,不能用逗号分割
      return String.join("\\",baseMapper.getAllCommunityNameListString(articleRange));
   }

   /**
    * 树列表-查询到社区的树
    *
    * @return
    */
   @Override
   public List<TreeStringNode> treeToCommunity(String isFiter) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(), null);
      Integer isAdministrator;
      // 判断是否是超级管理员,并且是否过滤，isfiter为空时，过滤
      if (StringUtils.isBlank(isFiter)) {
         isAdministrator = AuthUtils.isAdministratorOrAdmin(AuthUtil.getUserRole()) == true ? 1 : 2;
      } else {
         isAdministrator = 1;
      }
      // 查询
      Map<String, TreeStringNode> treeList = baseMapper.treeToCommunity(regionChildCodesList, isAdministrator);
      return NodeTreeUtil.getStringNodeTree(treeList);
   }
}