From 413bbb8dbcb2a75ac28850b95aac2d16faf27b7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 09:59:52 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 d9552a8..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;
@@ -33,7 +34,9 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,6 +63,9 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义分页查询
* @param page
@@ -68,6 +74,10 @@
*/
@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> list = new ArrayList<>();
if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
if (houseRental.getRoleName().equals("网格员")){
@@ -121,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<>();
@@ -320,6 +326,6 @@
@Override
public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
- return baseMapper.getStatisticsCount(AuthUtil.getUserId());
+ return baseMapper.getStatisticsCount(houseRental.getUserId(), houseRental.getNeiCode());
}
}
--
Gitblit v1.9.3