From bd92c2ab5b7baee24cb8204a3856c9de188a4f97 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Dec 2023 21:53:18 +0800
Subject: [PATCH] 区域查询修改，场所，房屋，住户，租赁，网格信息区域过滤，机构新增区域字段
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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..fed0dec 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("网格员")){
--
Gitblit v1.9.3