Commit 285586bc authored by lisong's avatar lisong

修改数据异常导致展示为"null"

parent 0b36e29e
...@@ -162,7 +162,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall ...@@ -162,7 +162,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertCalledDto.setCity(String.valueOf(map.get("city"))); alertCalledDto.setCity(String.valueOf(map.get("city")));
alertCalledDto.setDistrict(String.valueOf(map.get("district"))); alertCalledDto.setDistrict(String.valueOf(map.get("district")));
alertCalledDto.setUseStatus(String.valueOf(map.get("useStatus"))); alertCalledDto.setUseStatus(String.valueOf(map.get("useStatus")));
alertCalledDto.setUseSiteCategory(String.valueOf(map.get("useSiteCategory"))); alertCalledDto.setUseSiteCategory(ObjectUtils.isEmpty(map.get("useSiteCategory")) || "null".equals(String.valueOf(map.get("useSiteCategory"))) ? null : String.valueOf(map.get("useSiteCategory")));
alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit"))); alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit")));
alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode"))); alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode")));
} }
......
...@@ -480,6 +480,7 @@ public class ESElevatorServiceImpl { ...@@ -480,6 +480,7 @@ public class ESElevatorServiceImpl {
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent()); JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
SpecialEquipmentDto esElevatorDto =JSONObject.toJavaObject(jsonObject, SpecialEquipmentDto.class); SpecialEquipmentDto esElevatorDto =JSONObject.toJavaObject(jsonObject, SpecialEquipmentDto.class);
esElevatorDto.setCategoryCode("3000"); esElevatorDto.setCategoryCode("3000");
esElevatorDto.setInnerNum(ObjectUtils.isEmpty(esElevatorDto.getInnerNum()) || "null".equals(esElevatorDto.getInnerNum()) ? null : esElevatorDto.getInnerNum());
list.add(esElevatorDto); list.add(esElevatorDto);
} }
total =searchHits.getTotalHits(); total =searchHits.getTotalHits();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment