From 8d0edf8ef8dce19cf408a294de14140258ab0777 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 17 Jan 2024 19:38:40 +0800
Subject: [PATCH] 房屋出租新增居民过滤

---
 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index fe634e7..f5b1151 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -20,6 +20,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.grid.service.IGridService;
@@ -130,20 +131,16 @@
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean add(HouseRentalVO houseRentalVO) {
-//		// 判断添加人是否房屋业主
-//		Long count = iHouseholdService.count(Wrappers.<HouseholdEntity>lambdaQuery()
-//			.eq(HouseholdEntity::getHouseCode, houseRentalVO.getHouseCode())
-//			.eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
-//			.eq(HouseholdEntity::getRelationship, 1));
-//		if (count == 0) {
-//			return false;
-//		}
 		houseRentalVO.setCreateUser(AuthUtil.getUserId());
 		houseRentalVO.setCreateTime(new Date());
 		houseRentalVO.setUpdateUser(AuthUtil.getUserId());
 		houseRentalVO.setUpdateTime(new Date());
 		// 网格员新增默认是审核通过
 		houseRentalVO.setAuditStatus(1);
+		if (!Strings.isBlank(houseRentalVO.getRoleName()) && houseRentalVO.getRoleName().equals("居民")){
+			// 待审核
+			houseRentalVO.setAuditStatus(0);
+		}
 		//保存自身
 		boolean save = save(houseRentalVO);
 		List<String> phoneList = new ArrayList<>();

--
Gitblit v1.9.3