标签报事+通知公告

linwe

2023-11-12 8d8c7da4e91028fc877f101dcd244bef3e18c197

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

@@ -213,12 +213,19 @@
    * @return
    */
   private Map<String, Object> getHouseLevelData(HouseParam houseParam, Map<String, Object> map) {
      List<String> stringList = new ArrayList<>();
      if (null!=houseParam.getRoleName() && !houseParam.getRoleName().equals("")){
         if (houseParam.getRoleName().equals("网格员")){
            // 查询对应的房屋地址code
            stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
      }
      // 判断地址类型
      if (houseParam.getAddressType()==1) {
         List<FuncNode> aoiList = new ArrayList<>();
         List<FuncNode> shopList = new ArrayList<>();
         // 查询户室及住户相关信息，单元中包含住户,或者和单元平级的 商铺
         List<FuncNode> householdList = getUnitHouseholdList(houseParam.getName(), houseParam.getCode());
         List<FuncNode> householdList = getUnitHouseholdList(houseParam,stringList);
         // 遍历
         if (householdList.size()>0){
            for (FuncNode funcNode : householdList) {
@@ -236,7 +243,7 @@
         return map;
      }else{
         // 根据街路巷编号查询街路巷门牌名称集合
         List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam.getName(), houseParam.getCode());
         List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam,stringList);
         map.put("aoiList",new ArrayList<>());
         map.put("shopList",doorplateNameList);
         // 返回
@@ -297,10 +304,10 @@
    * @param code
    * @return
    */
   private List<FuncNode> getUnitHouseholdList(String name, String code) {
   private List<FuncNode> getUnitHouseholdList(HouseParam houseParam,List<String> stringList) {
      List<FuncNode> list = new ArrayList<>();
      // 查询户室及住户相关信息，单元中包含住户
      List<FuncNode> funcNodes  = baseMapper.getUnitHouseholdList(name,code);
      List<FuncNode> funcNodes  = baseMapper.getUnitHouseholdList(houseParam,stringList);
      // 遍历
      List<FuncNode> aoiNodes  = new ArrayList<>();
      List<FuncNode> shopNodes  = new ArrayList<>();