From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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..fe634e7 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
@@ -33,7 +33,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 +62,9 @@
 	@Autowired
 	private IGridService gridService;
 
+	@Autowired
+	private IDeptService deptService;
+
 	/**
 	 * 自定义分页查询
 	 * @param page
@@ -68,6 +73,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("网格员")){
@@ -320,6 +329,6 @@
 
 	@Override
 	public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
-		return baseMapper.getStatisticsCount(AuthUtil.getUserId());
+		return baseMapper.getStatisticsCount(houseRental.getUserId(), houseRental.getNeiCode());
 	}
 }

--
Gitblit v1.9.3