区域查询修改，e呼即办，网格员，网格巡查等过滤修改

zhongrj

2024-04-03 b42bdf8eb9baa28c6d2e363ffaebadfc62d2025a

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -752,18 +752,19 @@

   @Override
   public List<Map<String, Object>> labelStatistics(HouseVO house) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.labelStatistics(house, regionChildCodesList, isAdministrator);
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
      return baseMapper.labelStatistics(house, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator());
   }

   @Override
   public List<Map<String, Object>> labelCommunityStatistics(HouseVO house) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, regionChildCodesList);
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
      List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, commonParamSet.getRegionChildCodesList());
      for (Map<String, Object> map : list) {
         List<LabelVO> code = baseMapper.getlabelCount(house, regionChildCodesList, isAdministrator, map.get("code").toString());
         List<LabelVO> code = baseMapper.getlabelCount(house,
            commonParamSet.getRegionChildCodesList(),
            commonParamSet.getIsAdministrator(),
            map.get("code").toString());
         map.put("child",code);
      }
      return list;