新增民警楼盘，功能数据过滤

zhongrj

2023-12-23 2bd69d1dca40d2fdf07f72e0117d2f0febde5359

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -118,21 +118,26 @@
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      List<String> stringList = new ArrayList<>();
      List<String> communityList = new ArrayList<>();
      if (null!=roleName && !roleName.equals("")){
         houseParam.setRoleName(roleName);
         if (roleName.equals("网格员") && !userId.equals("1726859808689696770")){
            // 查询对应的房屋地址code
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
         if (roleName.equals("民警")){
            // 查询对应的社区编号
            communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      List<TreeStringNode> list = new ArrayList<>();
      if (null!=type) {
         // 如果是网格管理员，系统管理员
         // 如果是网格管理员，系统管理员,民警
         if (type==1){
            // 查询街道
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList);
            List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList,communityList);
            // 查询社区
            List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList);
            List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList,communityList);
            // 遍历
            for (TreeStringNode treeNode : townList) {
               // 遍历
@@ -228,12 +233,13 @@
      Map<String, Object> map = new HashMap<>(2);
      // 获取网格员对应的地址编号集合
      List<String> stringList = getHouseCodeList(houseParam);
      List<String> communityCodeList = getCommunityCodeList(houseParam);
      // 获取网格员对应的网格信息
      getGridInfoByGridman(houseParam);
      // 查小区，场所
      if (houseParam.getType()==1){
         // 根据社区名称查询小区集合
         list  = baseMapper.getDistrictList(houseParam,stringList);
         list  = baseMapper.getDistrictList(houseParam,stringList,communityCodeList);
      }
      // 查楼栋，街路巷
      if (houseParam.getType()==2){
@@ -626,6 +632,24 @@
   }

   /**
    * 根据角色获取社区编号集合
    * @param houseParam
    * @return
    */
   private List<String> getCommunityCodeList(HouseParam houseParam) {
      List<String> stringList = new ArrayList<>();
      String userId = AuthUtil.getUserId().toString();
      houseParam.setUserId(userId);
      if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
         if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
            // 查询对应的房屋地址code
            stringList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
         }
      }
      return stringList;
   }

   /**
    * 房屋数据处理
    * @return
    */