From 328d0a45a519bc4d0299d6d553042673d5098e21 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 27 Dec 2023 15:04:15 +0800
Subject: [PATCH] 楼盘表查询楼栋下户室(单个单元)修改

---
 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index b4d15bb..679e0df 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -441,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);
 		}
 	}
 

--
Gitblit v1.9.3