From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index c59e71d..68aac06 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
@@ -30,9 +31,9 @@
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.entity.UserDept;
import org.springblade.modules.system.mapper.DeptMapper;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,9 @@
@Autowired
private IPropertyCompanyService propertyCompanyService;
+
+ @Autowired
+ private IRegionService regionService;
@Override
public List<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param) {
@@ -196,16 +200,16 @@
queryWrapper.eq("is_deleted",0).eq("id", dept.getParentId());
Dept parentDept = getOne(queryWrapper);
// 如果父机构为物业公司
- if (parentDept.getDeptName().equals("物业公司")){
+ if (parentDept != null && parentDept.getDeptName().equals("物业公司")) {
// 查询当前
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0)
- .eq("dept_name",dept.getDeptName());
+ wrapper.eq("is_deleted", 0)
+ .eq("dept_name", dept.getDeptName());
Dept one = getOne(wrapper);
- if (null!=one){
+ if (null != one) {
dept.setId(one.getId());
flag = updateById(dept);
- }else {
+ } else {
flag = save(dept);
}
//保存物业公司信息
@@ -262,4 +266,32 @@
return DeptWrapper.build().listNodeVO(deptList);
}
+ /**
+ * 数据处理(社区绑定）
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Object dataHandle() {
+ // 查询未绑定的网格
+ List<TreeStringNode> list = regionService.getTree("361102005");
+ // 遍历
+ for (TreeStringNode treeStringNode : list) {
+ // 查询是否已创建
+ QueryWrapper<Dept> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("dept_name",treeStringNode.getName());
+ Dept one = getOne(wrapper);
+ if (null==one){
+ // 新增
+ Dept dept = new Dept();
+ dept.setParentId(1733066387113734145L);
+ dept.setFullName(treeStringNode.getName());
+ dept.setDeptName(treeStringNode.getName());
+ dept.setDeptCategory(1);
+ dept.setTenantId("000000");
+ // 新增
+ save(dept);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3