Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseDisputeProcessServiceImpl.java

@@ -100,8 +100,8 @@ public class BaseDisputeProcessServiceImpl extends BaseServiceImpl<BaseDisputePr
                 entity.setHappenDate(item.getHappenDate());
                 entity.setHappenPlace(item.getHappenPlace());
                 entity.setEventDescription(item.getEventDescription());
-                entity.setLng(item.getLng().toPlainString());
-                entity.setLat(item.getLat().toPlainString());
+                entity.setLng(null == item.getLng()?null:item.getLng().toPlainString());
+                entity.setLat(null == item.getLat()?null:item.getLat().toPlainString());
                 entity.setCreateBy(null == userMap.get(item.getReporterId())?null:String.valueOf(userMap.get(item.getReporterId())));
                 entity.setCreateDate(item.getReportTime());
                 entity.setUpdateDate(new Date());