From 60b96e9221632debb08aaf5fb7abd8361a90c0fb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 19:59:33 +0800
Subject: [PATCH] 社区新增面，网格员网格处理调整
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 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 105357a..ec91d5f 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
@@ -209,7 +209,8 @@
QueryWrapper<Region> regionWrapper = new QueryWrapper<>();
regionWrapper.eq("code",grid.getCommunityCode());
Region region = regionService.getOne(regionWrapper);
- // 查询父机构
+ // 查询父机构（社区机构）
+ System.out.println("社区名称 = " + region.getName());
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
wrapper.eq("dept_name",region.getName())
.eq("is_deleted",0);
@@ -218,22 +219,24 @@
QueryWrapper<Dept> wrapperChild = new QueryWrapper<>();
wrapperChild.eq("dept_name",grid.getGridName())
.eq("is_deleted",0)
- .eq("id",dept.getId());
- Dept deptChild = deptService.getOne(wrapperChild);
- if (null==deptChild){
+ .eq("parent_id",dept.getId());
+ List<Dept> deptChild = deptService.list(wrapperChild);
+ if (deptChild.size()==0){
Dept deptInfo = new Dept();
deptInfo.setParentId(dept.getId());
deptInfo.setFullName(grid.getGridName());
deptInfo.setDeptName(grid.getGridName());
deptInfo.setDeptCategory(1);
deptInfo.setTenantId("000000");
+ deptInfo.setRegionCode(grid.getGridCode());
+ deptInfo.setAncestors(dept.getAncestors() + "," +dept.getId());
// 新增
deptService.save(deptInfo);
// 查询网格是否已存在（社区编号-网格名称），已存在更新，不存在插入新的
QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("grid_name",grid.getGridName())
- .eq("is_deleted",0)
- .eq("community_code",grid.getCommunityCode());
+ queryWrapper.eq("grid_code",grid.getGridCode())
+ .eq("is_deleted",0);
+ System.out.println("网格编号 = " + grid.getGridCode());
GridEntity one = getOne(queryWrapper);
if (null!=one){
grid.setId(one.getId());
--
Gitblit v1.9.3