diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
index 2867d6e3..8d4f5d9e 100644
--- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
+++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
@@ -78,6 +78,7 @@ public class D350SurfaceInclineMessageExecutor implements Executor<D350SurfaceIn
                     .select("d.latitude as latitude")
                     .select("d.longitude as longitude")
                     .leftJoin("gnssstatus d on t.deviceid = d.deviceid")
+                    .eq("t.deviceid",deviceId)
                     .last("limit 1");
             device = deviceMapper.selectJoinOne(GnssDeviceJoin.class, jquery);
             if(device != null) deviceInfoMap.put(deviceId,device);
diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
index cad142b5..1431d419 100644
--- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
+++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
@@ -126,8 +126,10 @@ public class InclineDataForwarder{
         data.setZy(NumberUtils.scale((double) Zy, 3));
         data.setZz(NumberUtils.scale((double) Zz, 3));
         // 经纬度
-        data.setDevLng(device.getLongitude());
-        data.setDevLat(device.getLatitude());
+        if(device.getLongitude()!=null && device.getLatitude()!=null) {
+            data.setDevLng(device.getLongitude());
+            data.setDevLat(device.getLatitude());
+        }
 
         // 发送
         TCPClient tcpClient1 = tcpClientMap.get(device.getFwd_group_id());