bug 修复

zhongrj

2023-12-28 daef9edffb73d542ff1eba4beb215ffc7b306254

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

@@ -199,23 +199,32 @@
         houseNode.setId("1");
         houseNode.setHasChildren(true);
         houseNode.setChildren(houseNodeList);
         list.add(houseNode);

         TreeStringNode placeNode = new TreeStringNode();
         placeNode.setName("场所");
         placeNode.setId("2");
         placeNode.setHasChildren(true);
         placeNode.setChildren(placeNodeList);

         list.add(houseNode);
         list.add(placeNode);
         // 返回
         return list;
      }
      if (houseNodeList.size()>0){
         list = houseNodeList;
         TreeStringNode houseNode = new TreeStringNode();
         houseNode.setName("房屋");
         houseNode.setId("1");
         houseNode.setHasChildren(true);
         houseNode.setChildren(houseNodeList);
         list.add(houseNode);
      }
      if (placeNodeList.size()>0){
         list = placeNodeList;
         TreeStringNode placeNode = new TreeStringNode();
         placeNode.setName("场所");
         placeNode.setId("2");
         placeNode.setHasChildren(true);
         placeNode.setChildren(placeNodeList);
         list.add(placeNode);
      }
      // 返回
      return list;
@@ -432,24 +441,26 @@
            firstKey = key;
            break;
         }
         if (firstKey.equals("未知单元")){
            // 取出数据按楼层分组
            List<FuncNode> unitList = listMap.get(firstKey);
            Map<String, List<FuncNode>> floorListMap = unitList.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
            List<FuncNode> funcNodeList  = new ArrayList<>();
            floorListMap.forEach((s, temps) -> {
               FuncNode funcNode = new FuncNode();
               funcNode.setFloor(s);
               funcNode.setChildren(temps);
               funcNode.setAddressType(1);
               funcNodeList.add(funcNode);
            });
         // 取出数据按楼层分组
         List<FuncNode> unitList = listMap.get(firstKey);
         Map<String, List<FuncNode>> floorListMap = unitList.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
         List<FuncNode> funcNodeList  = new ArrayList<>();
         floorListMap.forEach((s, temps) -> {
            FuncNode funcNode = new FuncNode();
            funcNode.setUnitName("一单元");
            funcNode.setChildren(funcNodeList);
            funcNode.setFloor(s);
            funcNode.setChildren(temps);
            funcNode.setAddressType(1);
            list.add(funcNode);
            funcNodeList.add(funcNode);
         });
         FuncNode funcNode = new FuncNode();
         if (firstKey.equals("未知单元")) {
            funcNode.setUnitName("一单元");
         }else {
            funcNode.setUnitName(firstKey);
         }
         funcNode.setChildren(funcNodeList);
         funcNode.setAddressType(1);
         list.add(funcNode);
      }
   }

@@ -759,7 +770,7 @@
               placeEntity.setPlaceName(addressEntity.getPoi());
               placeEntity.setLng(addressEntity.getX());
               placeEntity.setLat(addressEntity.getY());
               placeEntity.setLocaltion(addressEntity.getAddressName());
               placeEntity.setLocation(addressEntity.getAddressName());
               // 设置来源( 1：地址总表  2：国控采集)
               placeEntity.setSource(1);
               // 加入集合
@@ -782,6 +793,8 @@
      // 扫码时调用，需判断是否有权限查看
      DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
      if (null!=one){
         // 不限制
         one.setIsJur(1);
         if (!Strings.isBlank(doorplateAddress.getRoleName())) {
            // 判断是否有权限
            if (doorplateAddress.getRoleName().equals("网格员")) {