Merge branch 'open_bohai' into 'master'

test

See merge request !631
This commit is contained in:
2023-05-18 12:43:54 +08:00
@@ -141,6 +141,7 @@ public class DistrictController {
}
public Object districtDetailAction(DistrictModel districtModel,HttpServletRequest request,HttpServletResponse response) {
System.out.println("小区详情coming");
//id和name不能同时为空
if(StringUtils.isBlank(districtModel.getId()) && (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()))) {
districtModel.setMsg("参数错误");
@@ -149,13 +150,16 @@ public class DistrictController {
District district = null;
if(StringUtils.isNotBlank(districtModel.getId())) {
System.out.println("小区详情1");
district = districtService.findById(districtModel.getId());
if(district != null) {
districtModel.setCityName(district.getCity());
districtModel.setRegion(district.getRegion());
districtModel.setName(district.getName());
}
} else {
System.out.println("小区详情2");
district = districtService.findByKeyMiniModel(districtModel.getCityName(), districtModel.getRegion(), districtModel.getName(), "district");
}