代码提交 bug解决

无关风月

2024-09-03 56dfe0d4bf81262622a1919cceb2b039fd356209

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java

@@ -1,6 +1,11 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.RegionQuery;
import com.ruoyi.management.domain.vo.RegionVo;
import com.ruoyi.management.mapper.SlRegionMapper;
import com.ruoyi.management.service.SlRegionService;
@@ -43,7 +48,7 @@
                regionVoList3.add(regionVo);
            }
            if (regionVo.getLevel() == 4) {
                regionVoList3.add(regionVo);
                regionVoList4.add(regionVo);
            }
        }

@@ -58,9 +63,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 +83,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,13 +100,50 @@
            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();
                    }
                }

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

    @Override
    public List<SlRegion> getcityRegione(RegionQuery regionQuery) {

        LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
        if (regionQuery.getCode()!=null){
            wrapper1.eq(SlRegion::getParentId,regionQuery.getCode());
        }
        wrapper1.eq(SlRegion::getLevel,2);
        List<SlRegion> page2 = this.list(wrapper1);
        return page2;
    }

    @Override
    public List<SlRegion> getcountyRegione(RegionQuery regionQuery) {
        LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
        if (regionQuery.getCode()!=null){
            wrapper1.eq(SlRegion::getParentId,regionQuery.getCode());
        }
        wrapper1.eq(SlRegion::getLevel,3);
        List<SlRegion> page2 = this.list(wrapper1);
        return page2;
    }

    @Override
    public List<SlRegion> gettownRegione(RegionQuery regionQuery) {
        LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
        if (regionQuery.getCode()!=null){
            wrapper1.eq(SlRegion::getParentId,regionQuery.getCode());
        }
        wrapper1.eq(SlRegion::getLevel,4);
        List<SlRegion> page2 = this.list(wrapper1);
        return page2;
    }
}