森林防火 供应商管理

rentaiming

2024-07-22 3fa04e2d1e41455b84b1bba63429a4513f44e74e

 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();
                    }
                }

            }
        }
        // 返回处理后的地区列表