From 00cdca2f95151f37acb25c7d6f330464da354c49 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 31 Oct 2023 23:23:42 +0800
Subject: [PATCH] 房屋，人员标签查询修改，人员标签数据更新接口新增
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..4320e41 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;
@@ -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