From 494aeb58eb885b40ab2fdb083aaa79007bb79ae2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 17:46:23 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
index 928fbdf..b25ec07 100644
--- a/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -17,9 +17,12 @@
package org.springblade.modules.district.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
+import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.vo.DistrictVO;
import org.springblade.modules.district.mapper.DistrictMapper;
@@ -27,11 +30,15 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
+import org.springblade.modules.property.service.IPropertyDistrictUserService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* 小区表 服务实现类
@@ -47,7 +54,9 @@
@Override
public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
- List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district);
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district,regionChildCodesList,isAdministrator);
// 遍历
for (DistrictVO districtVO : districtVOS) {
// 设置对应的网格名称
@@ -73,7 +82,14 @@
*/
@Override
public Object getDistrictTree(DistrictVO district) {
- List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(baseMapper.getDistrictTree(district));
+ // String userRole = AuthUtil.getUserRole();
+ // if (userRole.equals("wygly")) {
+ // IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
+ // List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
+ // district.setDistrictIdList(strings);
+ // }
+ Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
+ List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
stringNodeTree.forEach(node -> recursion(node));
return stringNodeTree;
}
--
Gitblit v1.9.3