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/place/service/impl/PlaceServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 5730afa..7fd6cc3 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -29,6 +29,7 @@
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
@@ -39,7 +40,9 @@
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
+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;
@@ -77,6 +80,12 @@
@Autowired
private IGridRangeService gridRangeService;
+ @Autowired
+ private IGridmanService gridmanService;
+
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义列表查询
* @param page
@@ -85,6 +94,10 @@
*/
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ place.setRegionCode(dept.getRegionCode());
+ }
List<String> list = new ArrayList<>();
if (null!=place.getRoleName() && !place.getRoleName().equals("")){
if (place.getRoleName().equals("网格员")){
@@ -185,7 +198,7 @@
if (null!=placeVO.getGridId()){
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id",placeVO.getGrid()).eq("house_code",placeVO.getHouseCode());
+ wrapper.eq("grid_id",placeVO.getGridId()).eq("house_code",placeVO.getHouseCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
if (null==one){
// 新增
@@ -194,6 +207,23 @@
gridRangeEntity.setGridId(placeVO.getGridId());
// 插入
gridRangeService.save(gridRangeEntity);
+ }
+ }else {
+ // 判断网格员，查询对应网格人对应的网格id
+ Integer gridId = gridmanService.getGridIdByUserId(AuthUtil.getUserId());
+ if (null!=gridId){
+ // 判断关联关系表是否存在
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("grid_id",gridId).eq("house_code",placeVO.getHouseCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null==one){
+ // 新增
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(placeVO.getHouseCode());
+ gridRangeEntity.setGridId(gridId);
+ // 插入
+ gridRangeService.save(gridRangeEntity);
+ }
}
}
}
@@ -353,6 +383,7 @@
PlaceExtEntity one = placeExtService.getOne(wrapper);
if (null == one) {
placeExtEntity.setPlaceId(placeVO.getId());
+ placeExtEntity.setLocaltion(placeVO.getLocaltion());
//新增
placeExtService.savePlaceExt(placeExtEntity);
}
--
Gitblit v1.9.3