diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
index d3cd3792..4edba0ab 100644
--- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
+++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
@@ -112,7 +112,7 @@ public class Forwarder {
         List<GnssDeviceJoin> gnssDeviceList;
         MPJQueryWrapper jquery = null;
 
-        if(resendRecord!=null && resendRecord.getDeviceid()!=null){
+        if(resendRecord!=null && !StringUtils.hasText(resendRecord.getDeviceid())){
             jquery = new MPJQueryWrapper<GnssDevice> ()
                     .selectAll(GnssDevice.class)
                     .select("d.latitude as latitude")
@@ -121,7 +121,7 @@ public class Forwarder {
                     .and(warpper->warpper.eq("fwd_group_id", fwdGroupId)
                             .or()
                             .eq("fwd_group_id2", fwdGroupId)).
-                    eq("deviceid", resendRecord.getDeviceid());
+                    eq("t.deviceid", resendRecord.getDeviceid());
         }
         else if(resendRecord!=null && resendRecord.getProjectid()!=null){
             jquery = new MPJQueryWrapper<GnssDevice> ()