Merge branch 'open_bohai' into 'master'

接口字段修改

See merge request !651
This commit is contained in:
2023-05-29 14:38:18 +08:00
3 changed files with 11 additions and 7 deletions
@@ -3668,11 +3668,11 @@ public class PropertyController {
} else {
b.setDirection("");
}
if (house.getPics() != null && !house.getPics().isEmpty()) {
b.setPic(transformPicsToFangJia(house.getPics().get(house.getPics().size() / 2)));
} else {
b.setPic("");
}
// if (house.getPics() != null && !house.getPics().isEmpty()) {
// b.setPic(transformPicsToFangJia(house.getPics().get(house.getPics().size() / 2)));
// } else {
// b.setPic("");
// }
if (house.getPublishDate() != null) {
if (new Date().before(house.getPublishDate())) {
house.setPublishDate(house.getModificationDate());
@@ -141,7 +141,6 @@ 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("参数错误");
@@ -150,7 +149,6 @@ public class DistrictController {
District district = null;
if(StringUtils.isNotBlank(districtModel.getId())) {
System.out.println("小区详情1");
district = districtService.findById(districtModel.getId());
if(district != null) {
@@ -43,5 +43,11 @@
<ladder>/address/fiveDivisionStructure</ladder>
</ladders>
</rule>
<rule controller="property" action="detail2" channel="v2">
<ladders>
<ladder>/property/detail</ladder>
</ladders>
</rule>
</rules>
</urlrewrite>