修改bug

puzhibing

2023-05-16 a6354b57ab2614b6211fbb89e24c5c8bec76ce86

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/BranchOfficeServiceImpl.java

@@ -21,54 +21,6 @@
public class BranchOfficeServiceImpl extends ServiceImpl<BranchOfficeMapper, BranchOffice> implements IBranchOfficeService {


    /**
     * 获取开通省市数据
     * @return
     * @throws Exception
     */
    @Override
    public List<OpenCityWarpper> queryOpenCity() throws Exception {
        List<BranchOffice> branchOffices = this.selectList(new EntityWrapper<BranchOffice>().eq("status", 1));
        List<OpenCityWarpper> province = new ArrayList<>();

        //遍历处理省级数据
        List<String> provinceCodes = new ArrayList<>();
        for (BranchOffice branchOffice : branchOffices) {
            String provinceCode = branchOffice.getProvinceCode();
            if(!provinceCodes.contains(provinceCode)){
                provinceCodes.add(provinceCode);

                OpenCityWarpper openCityWarpper = new OpenCityWarpper();
                openCityWarpper.setCode(provinceCode);
                openCityWarpper.setName(branchOffice.getProvinceName());
                province.add(openCityWarpper);
            }
        }

        //遍历处理省级对应的市级数据
        for (OpenCityWarpper openCityWarpper : province) {
            String code = openCityWarpper.getCode();

            List<OpenCityWarpper> city = new ArrayList<>();
            List<String> cityCodes = new ArrayList<>();
            for (BranchOffice branchOffice : branchOffices) {
                String provinceCode1 = branchOffice.getProvinceCode();
                String cityCode = branchOffice.getCityCode();

                if(code.equals(provinceCode1) && !cityCodes.contains(cityCode)){
                    cityCodes.add(cityCode);

                    OpenCityWarpper openCityWarpper1 = new OpenCityWarpper();
                    openCityWarpper1.setCode(cityCode);
                    openCityWarpper1.setName(branchOffice.getCityName());
                    city.add(openCityWarpper1);
                }
            }
            openCityWarpper.setSublevel(city);
        }
        return province;
    }


    /**
     * 根据城市code获取开通区域