From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java
index 4e85a30..078b62f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl.config;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.domain.pojo.config.Region;
@@ -7,6 +8,7 @@
import com.ruoyi.system.mapper.config.RegionMapper;
import com.ruoyi.system.service.config.RegionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.util.HttpUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -49,6 +51,7 @@
List<RegionVo> regionVoList = regionMapper.listRegionVo();
List<RegionVo> regionVoList1 = new ArrayList<>();
List<RegionVo> regionVoList2 = new ArrayList<>();
+ List<RegionVo> regionVoList3 = new ArrayList<>();
// 将地区按照级别分别存放到不同的列表中
for (RegionVo regionVo : regionVoList) {
if (regionVo.getLevel() == 1) {
@@ -57,9 +60,27 @@
if (regionVo.getLevel() == 2) {
regionVoList2.add(regionVo);
}
+ if (regionVo.getLevel() == 3) {
+ regionVoList3.add(regionVo);
+ }
}
RegionVo children;
Iterator<RegionVo> regionVoIterator2;
+
+ for (RegionVo regionVo : regionVoList2) {
+ if (null == regionVo.getChildren()) {
+ regionVo.setChildren(new ArrayList<>());
+ }
+ regionVoIterator2 = regionVoList3.iterator();
+ while (regionVoIterator2.hasNext()) {
+ children = regionVoIterator2.next();
+ if (regionVo.getId().equals(children.getParentId())) {
+ regionVo.getChildren().add(children);
+ regionVoIterator2.remove();
+ }
+ }
+ }
+
// 将第二级地区挂到第一级地区下面
for (RegionVo regionVo : regionVoList1) {
if (null == regionVo.getChildren()) {
@@ -80,7 +101,13 @@
return regionVoList1;
}
}
-
+
+
+ @Override
+ public List<RegionVo> listRegions(Long pid) {
+ return regionMapper.listRegions(pid);
+ }
+
/**
* @param
* @return List<RegionVo>
@@ -149,4 +176,10 @@
return regionVoList1;
}
}
+
+
+
+// public R renewalRegion(){
+// HttpUtils.doPost()
+// }
}
--
Gitblit v1.7.1