From a529164b6a9bbc8e456387ba3b3f76323f9b0208 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 29 Dec 2023 09:46:48 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 292bda7..fcd5ae3 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
@@ -31,7 +31,6 @@
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
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;
@@ -85,18 +84,18 @@
@Override
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
+ if (null != dept) {
house.setRegionCode(dept.getRegionCode());
}
List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house);
// 遍历查询网格
- for (HouseVO houseVO : houseVOS) {
- // 设置对应的网格名称
- GridVO gridVO = gridService.getGridDetailByHouseCode(houseVO.getHouseCode());
- if (null!= gridVO){
- houseVO.setGridName(gridVO.getGridName());
- }
- }
+// 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