From 5ddf5e221d718bc253fb87b8092b7e2ff08788f5 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 09 Apr 2024 16:31:19 +0800
Subject: [PATCH] 维修基金申请添加字段
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index b7efe4c..0867a16 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -141,7 +141,7 @@
*/
@Override
public List<TreeStringNode> getTree(RegionParamVO region) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
if (null!=region.getDeptNature()){
// 公安
@@ -162,12 +162,14 @@
*/
@Override
public List<TreeStringNode> getTownTree(String code) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
String regionCode = null;
- if (null != dept) {
- regionCode = dept.getRegionCode();
- if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
- regionCode = "361102";
+ if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ regionCode = dept.getRegionCode();
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
+ regionCode = "361102";
+ }
}
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
@@ -232,11 +234,11 @@
* @return
*/
@Override
- public List<Region> getRegionChild(String regionCode) {
+ public List<Region> getRegionChild(String regionCode,String communityCode) {
// 创建区域对象
List<Region> list = new ArrayList<>();
// 查询公安相关的区域数据
- List<Region> regionList = baseMapper.getPoliceList();
+ List<Region> regionList = baseMapper.getPoliceList(communityCode);
if (regionList.size()>0) {
List<Region> policeList = treeRegionList(regionList,regionCode, list);
list.addAll(policeList);
@@ -249,6 +251,25 @@
}
/**
+ * 获取民警下级区域
+ * @param regionCode
+ * @return
+ */
+ @Override
+ public List<Region> getPoliceRegionChild(String regionCode,String communityCode) {
+ // 创建区域对象
+ List<Region> list = new ArrayList<>();
+ // 查询公安相关的区域数据
+ List<Region> regionList = baseMapper.getPoliceList(communityCode);
+ if (regionList.size()>0) {
+ List<Region> policeList = treeRegionList(regionList,regionCode, list);
+ list.addAll(policeList);
+ }
+ // 返回
+ return list;
+ }
+
+ /**
* 获取某个父节点下面的所有子节点
* @param regionList
* @param parentCode
--
Gitblit v1.9.3