From 38bd9b02ce6d784718d170a0d8d7a64629b0475e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Dec 2023 18:05:08 +0800
Subject: [PATCH] 小区,房屋,人员,场所查询新增街道,社区,网格信息返回

---
 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 45fbf93..ba51e0f 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -28,6 +28,7 @@
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.grid.vo.GridVO;
 import org.springblade.modules.house.entity.HouseEntity;
 import org.springblade.modules.house.entity.HouseholdEntity;
 import org.springblade.modules.house.entity.UserHouseLabelEntity;
@@ -67,7 +68,16 @@
 
 	@Override
 	public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
-		return page.setRecords(baseMapper.selectHousePage(page, house));
+		List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house);
+		// 遍历查询网格
+		for (HouseVO houseVO : houseVOS) {
+			// 设置对应的网格名称
+			GridVO gridVO = gridService.getGridDetailByHouseCode(houseVO.getHouseCode());
+			if (null!= gridVO){
+				houseVO.setGridName(gridVO.getGridName());
+			}
+		}
+		return page.setRecords(houseVOS);
 	}
 
 	/**

--
Gitblit v1.9.3