From f756e347aa728c27fc73c56202f3123f24525d3f Mon Sep 17 00:00:00 2001 From: weidong Date: Tue, 29 Jul 2025 23:09:34 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=A1=A5=E4=BC=A0?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 gnssDeviceList; MPJQueryWrapper jquery = null; - if(resendRecord!=null && resendRecord.getDeviceid()!=null){ + if(resendRecord!=null && !StringUtils.hasText(resendRecord.getDeviceid())){ jquery = new MPJQueryWrapper () .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 ()