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

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -162,7 +162,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 alertCalledDto.setCity(String.valueOf(map.get("city")));
                 alertCalledDto.setDistrict(String.valueOf(map.get("district")));
                 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.setRegionCode(String.valueOf(map.get("regionCode")));
             }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ESElevatorServiceImpl.java

@@ -480,6 +480,7 @@ public class ESElevatorServiceImpl {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
                 SpecialEquipmentDto esElevatorDto =JSONObject.toJavaObject(jsonObject, SpecialEquipmentDto.class);
                 esElevatorDto.setCategoryCode("3000");
+                esElevatorDto.setInnerNum(ObjectUtils.isEmpty(esElevatorDto.getInnerNum()) || "null".equals(esElevatorDto.getInnerNum()) ? null : esElevatorDto.getInnerNum());
                 list.add(esElevatorDto);
             }
             total =searchHits.getTotalHits();