From 3fa04e2d1e41455b84b1bba63429a4513f44e74e Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 22 七月 2024 19:01:57 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java
index 85b3917..2520357 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java
@@ -43,7 +43,7 @@
regionVoList3.add(regionVo);
}
if (regionVo.getLevel() == 4) {
- regionVoList3.add(regionVo);
+ regionVoList4.add(regionVo);
}
}
@@ -58,9 +58,11 @@
regionVoIterator4 = regionVoList4.iterator();
while (regionVoIterator4.hasNext()) {
children = regionVoIterator4.next();
- if (regionVo.getCode().equals(children.getParentId())) {
- regionVo.getChildren().add(children);
- regionVoIterator4.remove();
+ if(children.getCode()!=null) {
+ if (regionVo.getCode().equals(children.getParentId().toString())) {
+ regionVo.getChildren().add(children);
+ regionVoIterator4.remove();
+ }
}
}
}
@@ -76,9 +78,11 @@
regionVoIterator3 = regionVoList3.iterator();
while (regionVoIterator3.hasNext()) {
children = regionVoIterator3.next();
- if (regionVo.getCode().equals(children.getParentId())) {
- regionVo.getChildren().add(children);
- regionVoIterator3.remove();
+ if(children.getCode()!=null){
+ if (regionVo.getCode().equals(children.getParentId().toString())) {
+ regionVo.getChildren().add(children);
+ regionVoIterator3.remove();
+ }
}
}
}
@@ -91,10 +95,13 @@
regionVoIterator2 = regionVoList2.iterator();
while (regionVoIterator2.hasNext()) {
children = regionVoIterator2.next();
- if (regionVo.getCode().equals(children.getParentId())) {
- regionVo.getChildren().add(children);
- regionVoIterator2.remove();
+ if (regionVo.getCode()!=null){
+ if (regionVo.getCode().equals(children.getParentId().toString())) {
+ regionVo.getChildren().add(children);
+ regionVoIterator2.remove();
+ }
}
+
}
}
// 返回处理后的地区列表
--
Gitblit v1.7.1