From eb55b4133ae6b3df80d8d14fbc5b32928f296fd7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 26 Dec 2023 14:17:07 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 c4efa62..cc77240 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
@@ -65,6 +65,10 @@
@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));
}
@@ -82,7 +86,7 @@
String[] split = gridExcel.getGridName().split("居民委员会");
GridEntity gridEntity = new GridEntity();
String communityName = split[0] + "居民委员会";
- gridEntity.setCommunityName(communityName);
+// gridEntity.setCommunityName(communityName);
// 通过社区名称查询对应的社区编号
QueryWrapper<Region> wrapper = new QueryWrapper<>();
wrapper.eq("name",split[0]);
@@ -284,4 +288,24 @@
objectObjectHashMap.put("doorplateAddress", result);
return objectObjectHashMap;
}
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ @Override
+ public Object getGridList(GridVO grid) {
+ return baseMapper.getGridList(grid);
+ }
+
+ /**
+ * 查询小区网格绑定
+ * @param aoiCode 小区aoiCode
+ * @return
+ */
+ @Override
+ public List<GridVO> getGridListByAoiCode(String aoiCode) {
+ return baseMapper.getGridListByAoiCode(aoiCode);
+ }
}
--
Gitblit v1.9.3