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 8d7c00ff..03fae212 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
@@ -71,6 +71,7 @@ public class Forwarder {
         }
         QueryWrapper<GnssGroupFwd> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name",fwdGroupId);
+        queryWrapper.last("limit 1");
         GnssGroupFwd gnssGroupFwd = fwdMapper.selectOne(queryWrapper);
         if(gnssGroupFwd == null){
             gnssGroupFwd = new GnssGroupFwd();
@@ -251,9 +252,12 @@ public class Forwarder {
         queryWrapper.eq("fwd_group_id",fwdGroupId);
         queryWrapper.ne("state",ResendRecord.STATE_FWD_OK);
         List<ResendRecord> resendRecordsList = resendRecordMapper.selectList(queryWrapper);
-        // 2.检索这个这个时间段的解算结果，如果有数据则单个终端转发，标志记录为已补传
-        for(ResendRecord record:resendRecordsList){
-            forwardBatchGnssRecords(record);
+        if(resendRecordsList!=null){
+            logger.info("forward history records: ",resendRecordsList.size());
+            // 2.检索这个这个时间段的解算结果，如果有数据则单个终端转发，标志记录为已补传
+            for(ResendRecord record:resendRecordsList){
+                forwardBatchGnssRecords(record);
+            }
         }
     }
 
@@ -272,6 +276,7 @@ public class Forwarder {
     void updateFwd(int fwd_num, boolean isFwdOK){
         QueryWrapper<GnssGroupFwd> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name",fwdGroupId);
+        queryWrapper.last("limit 1");
         GnssGroupFwd gnssGroupFwd = fwdMapper.selectOne(queryWrapper);
         if(gnssGroupFwd != null){
             gnssGroupFwd.setFwd_device_num(fwd_num);