management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -96,14 +96,14 @@ TRegion district = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tBranchOffice.getDistrictCode()) .last("LIMIT 1")); if(StringUtils.hasLength(tBranchOffice.getDistrictName())){ if(StringUtils.hasLength(tBranchOffice.getDistrictName()) && !tBranchOffice.getDistrictName().equals(tBranchOffice.getCityName())){ tBranchOfficeResp.setArea(tBranchOffice.getProvinceName()+"/"+tBranchOffice.getCityName()+"/"+tBranchOffice.getDistrictName()); }else { tBranchOfficeResp.setArea(tBranchOffice.getProvinceName()+"/"+tBranchOffice.getCityName()); } if(Objects.nonNull(city)){ if(Objects.nonNull(district)){ if(Objects.nonNull(district) && !district.getCode().equals(city.getCode())){ tBranchOfficeResp.setAreaId(city.getParentId()+"/"+city.getId()+"/"+district.getId()); }else { tBranchOfficeResp.setAreaId(city.getParentId()+"/"+city.getId()); 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()); // } if(StringUtils.hasLength(tDriver.getAreaName()) && !tDriver.getAreaName().equals(tDriver.getCityName())){ tDriverResp.setArea(tDriver.getProvinceName()+"/"+tDriver.getCityName()+"/"+tDriver.getAreaName()); if(Objects.nonNull(district) && Objects.nonNull(city)){ }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);
