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 6a240c91..f661861c 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
@@ -87,7 +87,9 @@ public class Forwarder {
                     record.setRb562n(record.getRb562n()-device.getB562n());
                     record.setRb562d(record.getRb562d()-device.getB562d());
                 }
-                if(device.getFwddeviceid()!=null) record.setDeviceid(device.getFwddeviceid());
+                if(device.getFwddeviceid()!=null && device.getFwddeviceid().trim().length()>0) {
+                    record.setDeviceid(device.getFwddeviceid());
+                }
                 recordsToSend.add(record);
             }
         }
@@ -160,8 +162,9 @@ public class Forwarder {
                 // 推送
                 lastTime = calcData.getCreatetime();
                 // 替换推送名和值
-                if(device.getFwddeviceid()!=null)
+                if(device.getFwddeviceid()!=null && device.getFwddeviceid().trim().length()>0) {
                     calcData.setDeviceid(device.getFwddeviceid());
+                }
                 if(device.getB562e()!=null &&
                         device.getB562n()!=null &&
                         device.getB562d()!=null){