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/grid/service/impl/GridServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index a21006d..105357a 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -65,11 +66,9 @@
@Override
public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- grid.setRegionCode(dept.getRegionCode());
- }
- return page.setRecords(baseMapper.selectGridPage(page, grid));
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ return page.setRecords(baseMapper.selectGridPage(page, grid,regionChildCodesList,isAdministrator));
}
/**
@@ -130,8 +129,8 @@
* @return
*/
@Override
- public GridVO getGridDetailByHouseCode(String houseCode) {
- return baseMapper.getGridDetailByHouseCode(houseCode);
+ public GridVO getPlaceGridDetailByHouseCode(String houseCode) {
+ return baseMapper.getPlaceGridDetailByHouseCode(houseCode);
}
/**
@@ -308,4 +307,25 @@
public List<GridVO> getGridListByAoiCode(String aoiCode) {
return baseMapper.getGridListByAoiCode(aoiCode);
}
+
+ /**
+ * 查询对应网格人对应的网格
+ * @param userId
+ * @return
+ */
+ @Override
+ public GridEntity getGridByUserId(Long userId) {
+ return baseMapper.getGridByUserId(userId);
+ }
+
+ /**
+ * 根据网格名称，社区名称查询对应的网格
+ * @param gridName
+ * @param communityName
+ * @return
+ */
+ @Override
+ public GridEntity getGridByNames(String gridName, String communityName) {
+ return baseMapper.getGridByNames(gridName,communityName);
+ }
}
--
Gitblit v1.9.3