From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 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..6c5c0bd 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,8 @@
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.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
@@ -62,9 +64,6 @@
@Autowired
private IGridService gridService;
- @Autowired
- private IDeptService deptService;
-
/**
* 自定义分页查询
* @param page
@@ -73,10 +72,8 @@
*/
@Override
public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- houseRental.setRegionCode(dept.getRegionCode());
- }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
List<String> list = new ArrayList<>();
if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
if (houseRental.getRoleName().equals("网格员")){
@@ -89,7 +86,7 @@
houseRental.setAuditStatus(2);
}
}
- List<HouseRentalTenantVO> houseRentalTenantVOS = baseMapper.selectHouseRentalPage(page, houseRental, list);
+ List<HouseRentalTenantVO> houseRentalTenantVOS = baseMapper.selectHouseRentalPage(page, houseRental, list,regionChildCodesList,isAdministrator);
for (HouseRentalTenantVO houseRentalTenantVO : houseRentalTenantVOS) {
if(houseRentalTenantVO.getStatus().equals(1)){
houseRentalTenantVO.setStatus(30);
@@ -130,20 +127,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