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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/mapper/RegionMapper.java

@@ -23,6 +23,7 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;

import java.util.List;
@@ -67,7 +68,9 @@
    * @return
    */
   @MapKey(value = "id")
    Map<String, TreeStringNode> getTreeList(@Param("region") RegionVO region);
    Map<String, TreeStringNode> getTreeList(@Param("region") RegionParamVO region,
                                 @Param("regionChildCodesList") List<String> regionChildCodesList,
                                 @Param("isAdministrator") Integer isAdministrator);

   /**
    * 树列表(获取当前树）
@@ -89,4 +92,49 @@
    * @return
    */
    List<Region> getCodeLess12DataList();

   /**
    * 查询下级区域(拼接网格)
    * @param regionCode
    * @return
    */
    List<Region> getRegionChildList(@Param("regionCode") String regionCode,
                           @Param("communityCode") String communityCode,
                           @Param("roleName") String roleName);

   /**
    * 查询公安对应的辖区树
    * @return
    */
   @MapKey(value = "id")
   Map<String, TreeStringNode> getPoliceTreeList();

   /**
    * 查询公安相关的区域数据
    * @return
    */
   List<Region> getPoliceList(@Param("communityCode") String communityCode);

   /**
    * 查询网格员对应的网格
    * @param regionCode
    * @return
    */
   List<Region> getGridRegionChildList(@Param("regionCode") String regionCode);

   /**
    * 查询当前文章范围对应的社区编号字符串集合
    * @param articleRange
    * @return
    */
    List<String> getAllCommunityNameListString(@Param("articleRange") String articleRange);

   /**
    * 树列表-查询到社区的树
    * @param regionChildCodesList
    * @param isAdministrator
    * @return
    */
   @MapKey(value = "id")
   Map<String, TreeStringNode> treeToCommunity(List<String> regionChildCodesList, Integer isAdministrator);
}