xuhy
2023-05-26 1ffff09037abaddd6e5edb2ae4813a51444200fa
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -141,9 +141,22 @@
        TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tDriver.getCityCode())
                .last("LIMIT 1"));
        tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
        if(Objects.nonNull(district) && Objects.nonNull(city)){
            tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
//        tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
//        if(Objects.nonNull(district) && Objects.nonNull(city)){
//            tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
//        }
        if(StringUtils.hasLength(tDriver.getAreaName()) && !tDriver.getAreaName().equals(tDriver.getCityName())){
            tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName());
        }else {
            tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName());
        }
        if(Objects.nonNull(city)){
            if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){
                tDriverResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId());
            }else {
                tDriverResp.setAreaId(city.getParentId()+"/"+city.getId());
            }
        }
        model.addAttribute("item",tDriverResp);