From 19832d9ee4aa62b19a3a0690836ed29aa5953e48 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 01 Nov 2023 14:57:56 +0800
Subject: [PATCH] 门牌表修改
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 9973c01..9eb260f 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
@@ -31,6 +31,7 @@
import org.springblade.modules.house.service.IHouseholdLabelService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalVO;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -78,9 +79,9 @@
// 如果是网格管理员，系统管理员
if (type==1){
// 查询街道
- List<TreeNode> townList = baseMapper.getRegionListByGrouyTwon();
+ List<TreeNode> townList = baseMapper.getRegionListByGroupTwon();
// 查询社区
- List<TreeNode> neiList = baseMapper.getRegionListByGrouyNei();
+ List<TreeNode> neiList = baseMapper.getRegionListByGroupNei();
TreeNode node = townList.get(0);
node.setHasChildren(true);
// 遍历
@@ -175,10 +176,15 @@
public Object getHouseRentInfo(String code) {
// 先查询门牌信息
DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
- // 查询房屋出租情况
- List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
- // 设置数据
- doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ if(null!= doorplateAddressDetailVO) {
+ // 查询房屋出租情况
+ List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
+ // 查询房屋人员情况
+ List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
+ // 设置数据
+ doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ doorplateAddressDetailVO.setHouseholdList(householdVOS);
+ }
// 返回
return doorplateAddressDetailVO;
}
--
Gitblit v1.9.3