From d2fe6340ee6a37bf73fd491a4adfcbe0f78eacd7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jan 2024 12:51:25 +0800
Subject: [PATCH] 社区民警修改
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index 9d99598..ac81170 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
@@ -45,10 +46,8 @@
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
-import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -80,9 +79,6 @@
private IGridRangeService gridRangeService;
@Autowired
- private IDeptService deptService;
-
- @Autowired
private IUserService userService;
@Autowired
@@ -90,19 +86,9 @@
@Override
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- house.setRegionCode(dept.getRegionCode());
- }
- List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house);
- // 遍历查询网格
-// for (HouseVO houseVO : houseVOS) {
-// // 设置对应的网格名称
-// GridVO gridVO = gridService.getGridDetailByHouseCode(houseVO.getHouseCode());
-// if (null!= gridVO){
-// houseVO.setGridName(gridVO.getGridName());
-// }
-// }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house,regionChildCodesList,isAdministrator);
return page.setRecords(houseVOS);
}
--
Gitblit v1.9.3