From 24f2e1047e0260915ce6e401ec36763974531eed Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 27 Jun 2024 10:15:23 +0800
Subject: [PATCH] 积木报表+业主大会统计
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index e6c6148..6246fa7 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -455,7 +455,7 @@
}
}
// 判断是否租户导入
- if (StringUtils.isNotBlank(isTenant) || householdEntity.getRelationship() == 18) {
+ if (StringUtils.isNotBlank(isTenant) || (householdEntity.getRelationship() != null && householdEntity.getRelationship() == 18)) {
householdEntity.setRelationship(18);
HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
.eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()).last("limit 1"));
--
Gitblit v1.9.3